Merge branch 'wip-MDL-62239-master' of https://github.com/Beedell/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 22 May 2018 02:05:13 +0000 (10:05 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 22 May 2018 02:05:13 +0000 (10:05 +0800)
commit7e603553d52a60af861391378adec38c3ad8e52a
treec568148af9c91fe84f59a50ee9a3c3daa0dbcf71
parentf94aaed80b4873f57151520f2616491a6e1d01fe
parent2d55b0b73669f1c93e57645e7af2a684f3ec237a
Merge branch 'wip-MDL-62239-master' of https://github.com/Beedell/moodle