Merge branch 'MDL-42434-master' of git://github.com/sarjona/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 20 Aug 2020 03:21:53 +0000 (11:21 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 20 Aug 2020 03:21:53 +0000 (11:21 +0800)

Trivial merge