Merge branch 'MDL-69687-master' of https://github.com/sammarshallou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Oct 2020 03:27:04 +0000 (11:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Oct 2020 03:27:04 +0000 (11:27 +0800)

Trivial merge