Merge branch 'MDL-68349-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 10 Nov 2020 02:14:57 +0000 (10:14 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 10 Nov 2020 02:14:57 +0000 (10:14 +0800)

Trivial merge