Merge branch 'MDL-57552-master' of git://github.com/aanabit/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 5 Jan 2021 14:20:32 +0000 (22:20 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 5 Jan 2021 14:20:32 +0000 (22:20 +0800)

Trivial merge