Merge branch 'MDL-51419-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jun 2018 00:41:43 +0000 (02:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jun 2018 00:41:43 +0000 (02:41 +0200)
commit8e059bc39f8450b0e11b476c63b24ba4050e3198
tree86aee2a26e5b4d0f467e6c591487a07faf619e3a
parent6153be6850869cdc3a6ae925dcf6e688ac481333
parent4d5046b0eb8234de85f6eef97e463b0b024ecb29
Merge branch 'MDL-51419-master' of https://github.com/snake/moodle