Merge branch 'MDL-62500-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE
commit8137f98b1cffa5fb03cfafd41bd8cee6630c52c1
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 May 2018 11:40:28 +0000 (21 13:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 May 2018 11:40:28 +0000 (21 13:40 +0200)
tree11a9dd1f6524081743863034320bfdbc70a1a27d
parente6973df683fdff0fa0de12cab2668450080c11a0
parent9103f6ca8ad66a15481548eff97a74666dcd6a30
Merge branch 'MDL-62500-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE