Merge branch 'MDL-65448-master' of git://github.com/lucaboesch/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Oct 2020 07:49:13 +0000 (15:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Oct 2020 07:49:13 +0000 (15:49 +0800)

Trivial merge