Merge branch 'MDL-70075-master-2' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 5 Nov 2020 04:51:31 +0000 (12:51 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 5 Nov 2020 04:51:31 +0000 (12:51 +0800)

Trivial merge