Merge branch 'MDL-59882-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 18:48:28 +0000 (20:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 18:48:28 +0000 (20:48 +0200)
commit34ecee16bb5ab67612d8a261b9a7b6cc198fbd12
treec6ed55f3ddaa2d232379e7ca8afa5c5331cec9c4
parent945cf16df8de7a27f1457d452c1add778611ac31
parent2a77813b51176303f5bab9e5db7ebb035a29e996
Merge branch 'MDL-59882-master' of git://github.com/andrewnicols/moodle