Merge branch 'MDL-61689-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
commit036ab38556cb85e93e92ef23f18477e44a2ad89b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Apr 2018 23:17:35 +0000 (3 01:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Apr 2018 23:17:35 +0000 (3 01:17 +0200)
tree5475dfb3b95517157cbbd1bb2bdae4cf5e0b497a
parent2baf76b657aafa0b3bafa450c660c28b20527d39
parent8269544f2fcc609e127e2cfcc64ae562003f1d68
Merge branch 'MDL-61689-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
phpunit.xml.dist