Merge branch 'wip-MDL-59655-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 07:27:38 +0000 (09:27 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 07:27:38 +0000 (09:27 +0200)
commitbfaf47e168c623d0ebae0e33f7d783bf4edfd508
tree5d0264127c37b5b33709e232e33bcd4f8fedd85e
parent21e68c5ff1b9310de394433fe84db0fff869560d
parent07ec41bcf9fef274e86f3ec197b8030b6feebb70
Merge branch 'wip-MDL-59655-master' of git://github.com/marinaglancy/moodle