Merge branch 'MDL-69296' of https://github.com/NeillM/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 02:27:55 +0000 (10:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 02:27:55 +0000 (10:27 +0800)

Trivial merge