Merge branch 'MDL-68146' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Mar 2020 03:33:25 +0000 (11:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Mar 2020 03:33:25 +0000 (11:33 +0800)

Trivial merge