Merge branch 'MDL-65649' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jan 2020 17:56:38 +0000 (18:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jan 2020 17:56:38 +0000 (18:56 +0100)

Trivial merge