Merge branch 'wip-MDL-62474-master' of git://github.com/abgreeve/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 18 Jun 2018 06:32:42 +0000 (14:32 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 18 Jun 2018 06:32:42 +0000 (14:32 +0800)
commit4fb6f0b5ce5880055bac0399613cb75fd0966466
treea4d303597d676967dd7ec0be78abbc027e53631b
parent3b6811a1130944fda2782ab91c307a2ceb2bd7d8
parentf43ed74cb0394e7184ab9e1f3fa79d2cfd09150a
Merge branch 'wip-MDL-62474-master' of git://github.com/abgreeve/moodle