Merge branch 'wip-MDL-49995-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Dec 2017 03:35:29 +0000 (11:35 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Dec 2017 03:35:29 +0000 (11:35 +0800)
commit8c2a7f9c386c1426202996aa7fe1e2d099481717
treee8809f6184e6ed20e3e0c6156fe266a505314990
parent560ae357a00da7f008e4fec46cc6c899f11f88ed
parent80364b7b1e70a9f6a62f51deabf7596a4e63a5a9
Merge branch 'wip-MDL-49995-master' of git://github.com/marinaglancy/moodle