Merge branch 'MDL-68445' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Apr 2020 10:29:20 +0000 (18:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Apr 2020 10:29:20 +0000 (18:29 +0800)

Trivial merge