Merge branch 'MDL-61502-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:49:59 +0000 (00:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:49:59 +0000 (00:49 +0200)
commitcb92d20996ffae0d9f29426fa4c72a17aac64120
tree580f8dc4f68cceeeceb4f45266a2aadcfecff8c4
parent5deadc8229809f5ae6eb7cf7e8c3266f9a724b9c
parentadb21080a36e90c928c8bdf6654dbe8c4886aa0f
Merge branch 'MDL-61502-master' of https://github.com/lucaboesch/moodle