Merge branch 'MDL-57977-master' of git://github.com/vmdef/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Jul 2018 19:09:55 +0000 (21:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Jul 2018 19:09:55 +0000 (21:09 +0200)
commit060277a4014ee4d31ad74a2631b637f22ac57e87
treeb2522b3a83662a5da718b6803fda6dff73551e2f
parenta50b8a438a63d795db6d55f576d6745d7a729fa4
parent10505522fc8ca82ddb73e75225739961633ce089
Merge branch 'MDL-57977-master' of git://github.com/vmdef/moodle