Merge branch 'MDL-66230' of https://github.com/paulholden/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 28 Aug 2019 06:54:36 +0000 (14:54 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 28 Aug 2019 06:54:36 +0000 (14:54 +0800)

Trivial merge