Merge branch 'MDL-63435-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2018 21:47:52 +0000 (23:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2018 21:47:52 +0000 (23:47 +0200)
commitb18df698e79f65ce317200d3ef0341cc7dfb6589
tree2330148c7ea8d328167efcd3dd28dfefb025ada0
parentca2ac0c1a318dfb8a9c7afb3bce596f625cd8f2a
parent18761623155129fb0adb0f2f99ec9cc4fe44f218
Merge branch 'MDL-63435-master' of https://github.com/lucaboesch/moodle