Merge branch 'master-MDL-69358' of https://github.com/golenkovm/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Aug 2020 02:57:19 +0000 (10:57 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Aug 2020 02:57:19 +0000 (10:57 +0800)

Trivial merge