Merge branch 'MDL-66306-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 6 Aug 2019 06:03:17 +0000 (14:03 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 6 Aug 2019 06:03:17 +0000 (14:03 +0800)

Trivial merge