Merge branch 'MDL-63746-34' of git://github.com/damyon/moodle into MOODLE_34_STABLE
commitb5d14e08a23e2b153c42138625eef79af003033d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Nov 2018 14:38:48 +0000 (1 15:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Nov 2018 14:38:48 +0000 (1 15:38 +0100)
tree241f0f90486fc9e00961eac701430b1847c80d3b
parent850050ed87a4cf055e0de8c9dc6bbda569c67a83
parent39e707450afe12644ad933953339dc6f0882188d
Merge branch 'MDL-63746-34' of git://github.com/damyon/moodle into MOODLE_34_STABLE