Merge branch 'MDL-42779-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 28 May 2018 09:42:44 +0000 (11:42 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 28 May 2018 09:42:44 +0000 (11:42 +0200)
commit4a34457ea7f373dfb7911dadeed81112d7593c60
treef0f4a2782ece69720ec6b9af6f234033bcb15b3d
parent1d6dd4388d180608d88f93afad876924d93b100a
parentd29bde594351b47b1a05a151f067b868494886b0
Merge branch 'MDL-42779-master' of https://github.com/lucaboesch/moodle