Merge branch 'wip-MDL-45500-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 04:56:18 +0000 (12:56 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 04:56:18 +0000 (12:56 +0800)
commitfe955c5645458df2e7a6692cc3c398b700f7acb5
treeea0c41c2ebeee9c3a3727ede9201d909d5029e09
parentc6a507e9e714689186ca249297dde6795cc29ffe
parent777720c83323f49f00aec5d4d2e0e84955fe574d
Merge branch 'wip-MDL-45500-master' of git://github.com/marinaglancy/moodle