Merge branch 'MDL-62656-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 14:57:36 +0000 (16:57 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 21:33:01 +0000 (23:33 +0200)
commitb596cdda82a18d96f47f723bb591ea93b8e77423
tree16f80bdf052fc9171fff8bef0671537e77ab48e8
parent2af5c8e7ef642424c8100d3b53b8f43d2f9a2b3c
parentc3c42514a11899a8ff4e319782ae970303499c7c
Merge branch 'MDL-62656-master' of git://github.com/mihailges/moodle