Merge branch 'MDL-65972-master' of git://github.com/bmbrands/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 20 Aug 2019 08:49:34 +0000 (16:49 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 20 Aug 2019 08:49:34 +0000 (16:49 +0800)

Trivial merge