Merge branch 'MDL-68341-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 21 Apr 2020 02:33:39 +0000 (10:33 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 23 Apr 2020 07:00:56 +0000 (15:00 +0800)

Trivial merge