Merge branch 'MDL-61689-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE
commitfe9c70b9b566ecb704e1744bebb12c0db05bc2c4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Apr 2018 23:17:26 +0000 (3 01:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Apr 2018 23:17:26 +0000 (3 01:17 +0200)
tree53e096eb6c75ae24407f2ed865e476933da403f0
parent5d4d21a31a87fc95971cda9b7012153be4cf2450
parent1886d9df926fd52750e31c23b1bc35916926a9c3
Merge branch 'MDL-61689-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE
phpunit.xml.dist