Merge branch 'MDL-62577-m' of https://github.com/micaherne/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 22:07:43 +0000 (00:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 22:07:43 +0000 (00:07 +0200)
commitd157f8774e4239f3713a8f62e81cb125ad6a330d
treed020e9938016abbe7ce7a96d8d4494ad6555dd28
parent009ab166898bd9107505f5d3f9eaf337aab26335
parente99a39624e3be4719aacafde46941222e7347754
Merge branch 'MDL-62577-m' of https://github.com/micaherne/moodle