Merge branch 'MDL-67660-master-v2' of https://github.com/TobiGa/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 22 Jan 2020 02:41:03 +0000 (10:41 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 22 Jan 2020 02:41:03 +0000 (10:41 +0800)

Trivial merge