Merge branch 'MDL-63303-master-fix' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 15 Nov 2018 10:01:24 +0000 (11:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 15 Nov 2018 10:01:24 +0000 (11:01 +0100)
commit6a7ee95231acb8a50206f4400f5005c982d69f79
treebfb502aa27d18af5593b6ca6ec4c59f9f663d6f4
parentac6cdcea06a4ac8850831ed992d6393aee67e11d
parent5e47224a62c1360349d414a4813aea53b392c43b
Merge branch 'MDL-63303-master-fix' of git://github.com/andrewnicols/moodle