Merge branch 'MDL-62432-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 15 May 2018 01:34:18 +0000 (09:34 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 15 May 2018 01:34:18 +0000 (09:34 +0800)
commitd060e0b80f0f53b60203f1ec32b741ac518ed398
tree1e6744b9da4c8a6d5473fbf1ca9154d48a162523
parent05c87e7bb45e5fdb0e8e0aca7bf0f4a073455393
parent63b0f6276c4ff40c4d8954ce872a81fc5602dee4
Merge branch 'MDL-62432-master' of git://github.com/andrewnicols/moodle