Merge branch 'MDL-66917' of https://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 15 May 2020 02:54:15 +0000 (10:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 15 May 2020 02:54:15 +0000 (10:54 +0800)

Trivial merge