Merge branch 'MDL-68388' of https://github.com/marcusboon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 26 May 2020 02:11:08 +0000 (10:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 26 May 2020 02:11:08 +0000 (10:11 +0800)

Trivial merge