Merge branch 'MDL-61665-master' of https://github.com/iamandrew/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:39:10 +0000 (00:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:39:10 +0000 (00:39 +0200)
commitf287b7efbb30482f32433a8a75da5557eec98b9b
treed6c4d8b5fc2a6219022d0150e6f9774747240be8
parentf9ee170a9b1fb7e73b0533484c1966f3f5444fc6
parente503ec17c0c4f48034310c0a46934e1616eb68ae
Merge branch 'MDL-61665-master' of https://github.com/iamandrew/moodle