Merge branch 'MDL-64220-master' of git://github.com/damyon/moodle
commitd67e734678dcff9757ea8e834b3a0fcbd3a861fc
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Nov 2018 15:47:10 +0000 (27 16:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Nov 2018 15:47:10 +0000 (27 16:47 +0100)
treeed09c9bcc60a4ab83581435e8f3459be8fc6f22b
parentf3194f39bbee6bac8b369879154b8a68679937e0
parentff015b5f7a2232ce8fdebceb575da92c89001201
Merge branch 'MDL-64220-master' of git://github.com/damyon/moodle