Merge branch 'MDL-50346-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 7 Aug 2019 09:11:31 +0000 (17:11 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 7 Aug 2019 09:11:31 +0000 (17:11 +0800)

Trivial merge