Merge branch 'MDL-67544-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2020 15:35:39 +0000 (16:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2020 15:35:39 +0000 (16:35 +0100)
commitfd25850a8d9679bff81c86b6935a79bafb0fc212
tree7b669e8f1e9a5bea1ed9265dd928702c66b4a45b
parent1b987615d9ab5f479a0e8c25296d50e4be4ae86e
parentf04c3272221b332ac306afcb00df24fecbd721eb
Merge branch 'MDL-67544-master' of git://github.com/andrewnicols/moodle