Merge branch 'MDL-69805-master' of https://github.com/dravek/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 8 Oct 2020 07:01:35 +0000 (15:01 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 8 Oct 2020 07:01:35 +0000 (15:01 +0800)

Trivial merge