Merge branch 'MDL-62653-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jul 2018 22:37:05 +0000 (00:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jul 2018 22:37:05 +0000 (00:37 +0200)
commite3f3c4125278dbc2e650889f81bf1f09464e6bdd
treee511373a9a60ec761e9bce155ad9b7f61de1c58a
parent75d4e6c4f13a68317c712ce6cc7644f370b740bf
parentdf95c479fc4887e497c6b9da707d30016c663dbe
Merge branch 'MDL-62653-master' of git://github.com/andrewnicols/moodle