Merge branch 'MDL-69143-master' of git://github.com/ferranrecio/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 23:45:16 +0000 (07:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 23:45:16 +0000 (07:45 +0800)

Trivial merge