Merge branch 'MDL-68750-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 27 May 2020 03:03:54 +0000 (11:03 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 27 May 2020 03:03:54 +0000 (11:03 +0800)

Trivial merge