Merge branch 'MDL-61817-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 23:22:36 +0000 (01:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 23:22:36 +0000 (01:22 +0200)
commitc8cbdfce246dcfc5fa808bcaf7ce2877441aa0ea
tree5044b86124569b472da0e3b1bcf57dea72765742
parent1c2d8c7fb358f72593f40c25471cd9eccab896b5
parent1d055d806bd3042441af0801be597c1ecde3e7b5
Merge branch 'MDL-61817-master' of git://github.com/andrewnicols/moodle