Merge branch 'MDL-68690-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jul 2020 22:17:11 +0000 (00:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jul 2020 22:17:11 +0000 (00:17 +0200)

Trivial merge