Merge branch 'MDL-58974-master' of git://github.com/vmdef/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 1 Aug 2019 01:02:52 +0000 (09:02 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 1 Aug 2019 01:02:52 +0000 (09:02 +0800)

Trivial merge