Merge branch 'MDL-62487' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 May 2020 04:10:02 +0000 (12:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 May 2020 04:10:02 +0000 (12:10 +0800)

Trivial merge