Merge branch 'MDL-68726-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jul 2020 22:37:03 +0000 (00:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jul 2020 22:37:03 +0000 (00:37 +0200)

Trivial merge