Merge branch 'MDL-68789-master' of git://github.com/crazyserver/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 May 2020 21:43:05 +0000 (23:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 May 2020 21:43:05 +0000 (23:43 +0200)

Trivial merge