Merge branch 'MDL-62654-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 13:19:18 +0000 (15:19 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 13:19:18 +0000 (15:19 +0200)
commitde0b684c383800ef93d062e8d6b1e30b6e0557c3
tree1f5329defb5be12e22e4fd183446b7020a36a31b
parent3a0e92cd6ad6b5e3d3042299b6f43e640b96a2ac
parentdad7b51e5fa792dda0c5777a21f1b21dc31b4a2a
Merge branch 'MDL-62654-master' of git://github.com/bmbrands/moodle