Merge branch 'MDL-61348-take2' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Apr 2018 23:59:15 +0000 (01:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Apr 2018 23:59:15 +0000 (01:59 +0200)
commitcd8a0226de2ac9df84151a5521cad59bea30c9c6
tree1337a529cf14f8224d8642daa374df5a4be4bd05
parent8000eac40818f5fe69a25822adc1cffb463a6539
parente37c1fe23d83f0f818b01db98646d70570763b6f
Merge branch 'MDL-61348-take2' of git://github.com/timhunt/moodle