Merge branch 'MDL-66458-master' of git://github.com/crazyserver/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 28 Aug 2019 03:25:16 +0000 (11:25 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 28 Aug 2019 03:25:16 +0000 (11:25 +0800)

Trivial merge