Merge branch 'MDL-63960-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 10 Nov 2018 09:27:35 +0000 (10:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 10 Nov 2018 09:27:35 +0000 (10:27 +0100)
commit42155e250111bbfd091b1941a7c6fb17a13016d2
treedab864a619e38399f3969130eda358f984c6e7e2
parent35afa11801ca6ec0967894984d7912d2758472ea
parentc083d1ad1e21c7599d10222cb134a725c4cb7232
Merge branch 'MDL-63960-master' of git://github.com/andrewnicols/moodle