Merge branch 'MDL-67830' of https://github.com/timhunt/moodle
commit3c87f49f79acad33ec1ca062f896e34f9aa0f463
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Feb 2020 18:07:55 +0000 (5 19:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Feb 2020 18:07:55 +0000 (5 19:07 +0100)
tree7d928125e6df7de8db2e2cd2778bb98e74cbb5c5
parent53be27e4fb003e926d698c2c444a00909436dc49
parenta33e0b4d8448e6d6f80190310427bec73af83126
Merge branch 'MDL-67830' of https://github.com/timhunt/moodle