Merge branch 'MDL-65074-310' of https://github.com/hitteshahuja/moodle into MOODLE_31...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Oct 2020 21:12:25 +0000 (23:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Oct 2020 21:12:25 +0000 (23:12 +0200)

Trivial merge