Merge branch 'MDL-69013-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 11 Jun 2020 03:28:31 +0000 (11:28 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 11 Jun 2020 03:28:31 +0000 (11:28 +0800)

Trivial merge