Merge branch 'MDL-61460-master-fix' of https://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 8 Jul 2021 03:18:29 +0000 (11:18 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Jul 2021 21:30:34 +0000 (23:30 +0200)

Trivial merge