Merge branch 'MDL-62651-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2018 16:38:05 +0000 (18:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2018 16:38:05 +0000 (18:38 +0200)
commita9f6dd075a1e696428886882a611841f03320462
tree1a2d95309bd95571a445075324778d77bf51292e
parentd0f9d0ef4def6ea99422b325a8744a63b15357d3
parent31bef9bdc897edae7e0bd179c97c78f364f1071f
Merge branch 'MDL-62651-master' of git://github.com/andrewnicols/moodle