Merge branch 'MDL-67800-master-3' of git://github.com/aanabit/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2020 01:56:54 +0000 (09:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2020 03:06:11 +0000 (11:06 +0800)

Trivial merge