Merge branch 'MDL-63109-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2018 15:50:13 +0000 (17:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2018 15:50:13 +0000 (17:50 +0200)
commitddf86f9930efad6abd52aafe540e611d7c687e64
tree1717cb2f6b788b685114348dd981b0add14c2bce
parent542201d54720ed8aed1fc18df568f6c885b4d479
parent85de6d525d33e16448336c7f12584d88601442ae
Merge branch 'MDL-63109-master' of git://github.com/mihailges/moodle