Merge branch 'MDL-63284-master' of https://github.com/Clyxz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Jun 2020 22:25:04 +0000 (00:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Jun 2020 22:25:04 +0000 (00:25 +0200)

Trivial merge