Merge branch 'MDL-60260' of https://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 23:54:26 +0000 (07:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 23:54:26 +0000 (07:54 +0800)
commitc59247e1e893bd673691d431882d934a20c6d7c4
treebf31ec77b8c9437812641588543aafb6e726967e
parentf27f995522b42683ce3bf57dad263e22f9a6d37a
parent9dbb05ffe0f3f4a72374d026cb342a80ef008801
Merge branch 'MDL-60260' of https://github.com/paulholden/moodle