Merge branch 'MDL-63632-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE
commitbe3a6f83c2fecb48730e22f1c469f2bddbe881d6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Oct 2018 00:39:33 +0000 (18 02:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Oct 2018 00:39:33 +0000 (18 02:39 +0200)
tree6fbed83ddf6e6537c9b1665d8cd7b33e3a98b0ac
parentab4d4619c2e152ddbc7e2cd526a19cf98f62cfc3
parent7fa07866b7ae91c5f4eb82e91af6c593cf070f48
Merge branch 'MDL-63632-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE