Merge branch 'MDL-66371-master' of git://github.com/rezaies/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 9 Oct 2019 05:33:17 +0000 (13:33 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 9 Oct 2019 05:33:17 +0000 (13:33 +0800)

Trivial merge