Merge branch 'MDL-68153' of https://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 25 Mar 2020 14:34:36 +0000 (22:34 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 25 Mar 2020 14:34:36 +0000 (22:34 +0800)

Trivial merge