Merge branch 'MDL-70482_master' of https://github.com/sebmehr/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 6 Jan 2021 03:27:17 +0000 (11:27 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 6 Jan 2021 03:27:17 +0000 (11:27 +0800)

Trivial merge