Merge branch 'MDL-72348-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Oct 2021 03:03:05 +0000 (11:03 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Oct 2021 21:18:51 +0000 (23:18 +0200)

Trivial merge