Merge branch 'MDL-65967-master' of https://github.com/danielneis/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Apr 2020 15:31:20 +0000 (17:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Apr 2020 15:31:20 +0000 (17:31 +0200)

Trivial merge