Merge branch 'MDL-67828-master' of git://github.com/rezaies/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 27 May 2020 08:48:03 +0000 (16:48 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 27 May 2020 08:48:03 +0000 (16:48 +0800)

Trivial merge