Merge branch 'MDL-63842-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE
commit4c39ccf8a33402472c80d816d1c670e824a33b2f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Nov 2018 15:12:13 +0000 (14 16:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Nov 2018 15:12:13 +0000 (14 16:12 +0100)
treef3058dd6752bd55d9a0c0c2e0678325cd26ad152
parent270ba664084bed03b3b1d6470fe2b3cb902a272b
parent622be7e6303001a091c4076bf12e2ee19c339f3f
Merge branch 'MDL-63842-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE