Merge branch 'MDL-62813-master' of git://github.com/lameze/moodle
commitf8839747ceb58eb75afe670576009c6b9536f101
authorDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 13:29:38 +0000 (3 15:29 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 21:33:00 +0000 (3 23:33 +0200)
tree4520c26b62e4442616077d82465678f5ee553e22
parentde0b684c383800ef93d062e8d6b1e30b6e0557c3
parent23b05f1841a5092158b52e3441b29bdc17a2767c
Merge branch 'MDL-62813-master' of git://github.com/lameze/moodle