Merge branch 'master' of https://github.com/DrCuriosity/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Apr 2020 21:08:26 +0000 (23:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Apr 2020 21:08:26 +0000 (23:08 +0200)

Trivial merge