Merge branch 'MDL-63020_34' of git://github.com/timhunt/moodle into MOODLE_34_STABLE
commitfd5cc5ee03e419746ee7d11dab6f1c121777b08b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Sep 2018 15:42:52 +0000 (24 17:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Sep 2018 15:42:52 +0000 (24 17:42 +0200)
tree5c31175f9b2438ca5b30a2898be3de5e31c1904e
parentf05c493776af85d976b219a49d81ccaedd485241
parenteb43bdbbb022c9e37ca9b604be4f1e174ae12ad7
Merge branch 'MDL-63020_34' of git://github.com/timhunt/moodle into MOODLE_34_STABLE