Merge branch 'MDL-54967-master' of git://github.com/zig-moodle/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Dec 2017 04:43:50 +0000 (12:43 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Dec 2017 04:43:50 +0000 (12:43 +0800)
commite95db3416ce09259dad6abb8c7c8e97a99105cd2
tree54b65c853e4f4373fbe8899cfe909220130a8ca4
parent8c2a7f9c386c1426202996aa7fe1e2d099481717
parente0d0f411cf1b263f89021fef3287c6a200f8b40a
Merge branch 'MDL-54967-master' of git://github.com/zig-moodle/moodle