Merge branch 'MDL-63109-34' of git://github.com/mihailges/moodle into MOODLE_34_STABLE
commit39d9d254f816d8e3c83ae518c1caf02b69729acd
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2018 16:32:17 +0000 (18 18:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2018 16:32:17 +0000 (18 18:32 +0200)
tree6cf5765a1d6d202a10e5cf742d7bf93204ed2c1a
parentcb5fb29cd76e3b8cafbf80e05a30369e7d66af80
parent2eccec95425b924d97c6894bc701221a87d7a1ae
Merge branch 'MDL-63109-34' of git://github.com/mihailges/moodle into MOODLE_34_STABLE