Merge branch 'MDL-68864-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 10 Jun 2020 03:26:13 +0000 (11:26 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 10 Jun 2020 03:26:13 +0000 (11:26 +0800)

Trivial merge