Merge branch 'MDL-69758-m310' of https://github.com/sammarshallou/moodle into MOODLE_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Oct 2020 21:44:15 +0000 (23:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Oct 2020 21:44:15 +0000 (23:44 +0200)

Trivial merge