Merge branch 'wip-MDL-31436-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 03:27:28 +0000 (11:27 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 03:27:28 +0000 (11:27 +0800)
commite82c025e60d88d1650b69826e99fec2aa1d526cc
tree11e94f286257809903bb9eb53f6ed1516fed897c
parent109aa076480fca62c81f3bf9849896031d4e5710
parentefe4210395a73e461289bbcc4f660c26841ef41c
Merge branch 'wip-MDL-31436-master' of git://github.com/marinaglancy/moodle