Merge branch 'MDL-60943-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 23:52:17 +0000 (00:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 23:52:17 +0000 (00:52 +0100)
commitb9e05ae65d3ddd4c5050365ecc6cfd405e0e8076
tree1d53389bc4af69678a1e8c98635d0d954be83cbf
parentabe4713565e0b227874ddca2463134af61504618
parentd20ec3606b0c9d51df07970d107b1b6c7ad2cd67
Merge branch 'MDL-60943-master' of https://github.com/sammarshallou/moodle