Merge branch 'wip-MDL-62584-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 28 May 2018 14:31:00 +0000 (16:31 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 28 May 2018 14:31:00 +0000 (16:31 +0200)
commitc89b495650714e7b0c791450178a85ba7b72f58e
treeb6d4dbbfae3633cfc20aac6167028fe09ab9c625
parent00977e984eef2e1314e3f212f0db2666bb28efcf
parent024ede2c6bcd240302d31343bb63293d96659872
Merge branch 'wip-MDL-62584-master' of git://github.com/marinaglancy/moodle