Merge branch 'wip-MDL-59768-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 Sep 2017 11:45:39 +0000 (13:45 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:50:16 +0000 (10:50 +0200)
commit44e1928532f323a66abab77a0be8ffccab0a0180
treeff372552a8d23f49d8d4507eb1237862e367e8f7
parent72086f77f1766cb58ab537872fb88c069b26c8fc
parent96e1633f57b2076e33c766759129694ec28f869f
Merge branch 'wip-MDL-59768-master' of git://github.com/marinaglancy/moodle