Merge branch 'MDL-61343-master' of git://github.com/Kathrin84/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Apr 2018 06:29:39 +0000 (08:29 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Apr 2018 06:29:39 +0000 (08:29 +0200)
commite7d10540d97f3b73fec08fc3b17ecfe6c90c3448
tree397ef449112469ca7691cd798955e3a2838c2252
parentfd91aab1e762a35ca8de31927ebccc360b0d6760
parentea91e4f97d3cd357bed3fb70400f9aa0720954bc
Merge branch 'MDL-61343-master' of git://github.com/Kathrin84/moodle