Merge branch 'MDL-65393-master' of git://github.com/rezaies/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 15 May 2019 02:52:57 +0000 (10:52 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 15 May 2019 02:52:57 +0000 (10:52 +0800)

Trivial merge