Merge branch 'MDL-62079-master' of git://github.com/andrewnicols/moodle
commitac8f106b4dfb904373ab9befe9f7a3c915766fd2
authorJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 03:56:23 +0000 (24 11:56 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 03:56:23 +0000 (24 11:56 +0800)
treec5c11e7d2a3987dff56bb480c6e57538b4e5ee3b
parent7d05f5813d5f2e437c53087fb415950d61614065
parente055b85a0f576f6fe814ff4385b24253c2beddd3
Merge branch 'MDL-62079-master' of git://github.com/andrewnicols/moodle