Merge branch 'MDL-41312-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Jan 2018 01:02:54 +0000 (02:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Jan 2018 01:02:54 +0000 (02:02 +0100)
commit8bdee69d3e9f8f4ba15e42a84cd14163aedd528e
tree808783d81bf450bf086800ea4c159cc032153585
parent3f5cae3679a2f38e275736544756e9f3f36f5bb5
parent50587d71a58e608e6a7e7808a9274b8971a86635
Merge branch 'MDL-41312-master' of git://github.com/ankitagarwal/moodle