Merge branch 'MDL-60630-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Sep 2018 21:14:54 +0000 (23:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Sep 2018 21:14:54 +0000 (23:14 +0200)
commit0e05bac861fc551260b759fcf88fccf0bb6f0a19
treedf7c15a1fdccefbd18765ad72282e4c3363c427b
parent79e2d710d3a5d468570d65a8445c218797744048
parent666196271f2a83c6db22774fc75b2e261ee27994
Merge branch 'MDL-60630-master' of git://github.com/andrewnicols/moodle