Merge branch 'MDL-71141-master' of git://github.com/ferranrecio/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 29 Apr 2021 07:40:51 +0000 (15:40 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 29 Apr 2021 07:40:51 +0000 (15:40 +0800)

Trivial merge