Merge branch 'MDL-65735' of https://github.com/paulholden/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 17 Dec 2019 05:25:02 +0000 (13:25 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 17 Dec 2019 05:25:02 +0000 (13:25 +0800)

Trivial merge