Merge branch 'MDL-62691-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 13:35:54 +0000 (15:35 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 21:33:00 +0000 (23:33 +0200)
commit772ae9d4fd19bab002a648a1129387c6a77efae1
tree9e72e8cc7714244c94a599acacb57918fa510eec
parentf8839747ceb58eb75afe670576009c6b9536f101
parentc8c595e6d0ccb5f6616f68297ce0b4f006bfd5e0
Merge branch 'MDL-62691-master' of git://github.com/bmbrands/moodle