Merge branch 'MDL-68288-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 15 Apr 2020 15:20:23 +0000 (23:20 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 15 Apr 2020 15:20:23 +0000 (23:20 +0800)

Trivial merge