Merge branch 'wip-MDL-59055-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 07:21:21 +0000 (09:21 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 07:21:21 +0000 (09:21 +0200)
commit037093107689cf32424470f308dd888f47b0b024
tree42d5f04065fd4f3b39d316d4e8b83538f57a1b5d
parent53ce3e4f74d5b18587c643fb3f42deae7fe6067f
parentfe9965e305f113284f92d6a155e778fb6c67ad14
Merge branch 'wip-MDL-59055-master' of git://github.com/marinaglancy/moodle