Merge branch 'MDL-62381_master' of https://github.com/Syxton/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 29 May 2018 14:34:40 +0000 (16:34 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 May 2018 14:34:40 +0000 (16:34 +0200)
commit060884dfd6ef47d433143f439552cf08541ddbef
tree1d60b950e676c7d2b28c81e12534f894a30785b7
parentf1b701e6ce189ca108d3fdb09675a22ef3e7a611
parent197e714dfd6a4611c9ffb327b706531051dc6492
Merge branch 'MDL-62381_master' of https://github.com/Syxton/moodle