Merge branch 'MDL-61597-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Mar 2018 01:25:11 +0000 (02:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Mar 2018 01:25:11 +0000 (02:25 +0100)
commitb7614ab1143288ef81381b4c09461aaa2bd6b7c7
tree684dae3364b0f0461b4c25a6eae436fb64888911
parentb2d941c16f0e683c432b2ece350d80d6645924cc
parent48c091e51026521c02bb255fc71da45aa0ddd719
Merge branch 'MDL-61597-master' of git://github.com/andrewnicols/moodle