Merge branch 'MDL-62382-master' of git://github.com/ryanwyllie/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 04:06:03 +0000 (12:06 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 04:06:03 +0000 (12:06 +0800)
commit44d89dfa7a933796f06d195ef0d703691a625612
treea500e1f0d5d4b1debe5b2cb47a7f017db55fc095
parent61b1cc4dd7591ccedd904867536fc0221117ac0d
parentebe7417f9474f03a1268f5341f8757be77ee2b6a
Merge branch 'MDL-62382-master' of git://github.com/ryanwyllie/moodle