Merge branch 'MDL-60810_master' of git://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 Nov 2017 07:57:00 +0000 (15:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 Nov 2017 07:57:00 +0000 (15:57 +0800)
commit1d596960177cac6fffa38431ff6b2e3a3c4b4aee
tree0803006e238a487739b605b00ea1032da68088fe
parentf1c9b8de4748d6da989ee177af7db6a2170fef9a
parent2ce65788357f4f511b6881c784c1f178a2b846f1
Merge branch 'MDL-60810_master' of git://github.com/markn86/moodle