Merge branch 'MDL-67304_master' of git://github.com/dmonllao/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 17 Dec 2019 05:46:27 +0000 (13:46 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 17 Dec 2019 05:46:27 +0000 (13:46 +0800)

Trivial merge