Merge branch 'MDL-70376-master' of git://github.com/peterRd/moodle
authorSara Arjona <sara@moodle.com>
Wed, 1 Sep 2021 14:52:02 +0000 (16:52 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 1 Sep 2021 14:52:02 +0000 (16:52 +0200)

Trivial merge