Merge branch 'MDL-68356-master' of git://github.com/cescobedo/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 21 Apr 2020 01:24:54 +0000 (09:24 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 23 Apr 2020 07:00:56 +0000 (15:00 +0800)

Trivial merge