Merge branch 'MDL-62060-master' of git://github.com/rezaies/moodle
commit1891ed7bb096b66d9d5f7e65b638517f0fdc6c9f
authorJun Pataleta <jun@moodle.com>
Tue, 1 May 2018 02:44:59 +0000 (1 10:44 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 1 May 2018 02:44:59 +0000 (1 10:44 +0800)
tree33568552f3a2a1aac0f30cf44201c0f0e7b95342
parent15729d9ffab1c3f4783628f44e4c4c4915f8881e
parentc5d720ab51025898b7f908e535156d36d248e05c
Merge branch 'MDL-62060-master' of git://github.com/rezaies/moodle