Merge branch 'MDL-46975-master' of git://github.com/junpataleta/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 10 Apr 2019 06:23:59 +0000 (14:23 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 10 Apr 2019 06:23:59 +0000 (14:23 +0800)

Trivial merge