Merge branch 'MDL-69283-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 29 Sep 2020 05:53:42 +0000 (13:53 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 29 Sep 2020 05:53:42 +0000 (13:53 +0800)

Trivial merge