Merge branch 'MDL-70863-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 29 Apr 2021 07:04:11 +0000 (15:04 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 29 Apr 2021 07:04:11 +0000 (15:04 +0800)

Trivial merge