Merge branch 'wip-MDL-67545-master' of https://github.com/Beedell/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jan 2020 18:28:56 +0000 (19:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jan 2020 18:28:56 +0000 (19:28 +0100)

Trivial merge