Merge branch 'MDL-67097-master-2' of https://github.com/snake/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 6 Nov 2019 08:12:46 +0000 (16:12 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Nov 2019 08:12:46 +0000 (16:12 +0800)

Trivial merge