Merge branch 'MDL-67702' of https://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Nov 2020 02:34:02 +0000 (10:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Nov 2020 02:34:02 +0000 (10:34 +0800)

Trivial merge