Merge branch 'MDL-51177-master' of git://github.com/andrewnicols/moodle
commit19d8da756119024f0952e6e4657f851c1e043f8a
authorJun Pataleta <jun@moodle.com>
Wed, 12 Sep 2018 05:30:39 +0000 (12 13:30 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 12 Sep 2018 05:30:39 +0000 (12 13:30 +0800)
tree1ab04807a78d31277c1aae9e21564b59d1e297e5
parentd784584243a57c32746904883f90d786997ad8ca
parent3951d50a8902ad2cd8e1f0a2eac4c5bb303741c4
Merge branch 'MDL-51177-master' of git://github.com/andrewnicols/moodle