Merge branch 'MDL-67790-master' of git://github.com/aanabit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 May 2020 21:01:20 +0000 (23:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 May 2020 21:01:20 +0000 (23:01 +0200)

Trivial merge