Merge branch 'MDL-69735' of https://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 16 Dec 2020 15:01:28 +0000 (23:01 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 16 Dec 2020 15:01:28 +0000 (23:01 +0800)

Trivial merge