Merge branch 'wip-MDL-59775-fix' of https://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 14 Sep 2017 04:17:14 +0000 (12:17 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 14 Sep 2017 04:17:14 +0000 (12:17 +0800)
commita2bcf808d99483eb5c5964361cb1f971831c9aed
tree6d02d19baafe50d86a729b64722804f415769a93
parentafe9093748335026f8af1b8b0cef76f46786ecf5
parentf9af5427694f367f8b20067e47c49d53933f3b8f
Merge branch 'wip-MDL-59775-fix' of https://github.com/marinaglancy/moodle