Merge branch 'MDL-69449' of https://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Aug 2020 01:23:39 +0000 (09:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Aug 2020 01:23:39 +0000 (09:23 +0800)

Trivial merge