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

Trivial merge