Merge branch 'MDL-71016' of git://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Thu, 29 Apr 2021 07:21:39 +0000 (09:21 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 29 Apr 2021 07:21:39 +0000 (09:21 +0200)

Trivial merge