Merge branch 'MDL-68551' of https://github.com/Neosi/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 May 2020 03:48:46 +0000 (11:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 May 2020 03:48:46 +0000 (11:48 +0800)

Trivial merge