Merge branch 'MDL-68348-master-6' of git://github.com/mickhawkins/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 25 May 2020 23:48:53 +0000 (07:48 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 25 May 2020 23:48:53 +0000 (07:48 +0800)

Trivial merge