Merge branch 'MDL-60920-master' of https://github.com/lucaboesch/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:39:20 +0000 (11:39 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:39:20 +0000 (11:39 +0800)
commit302104af4bd3793e5476221641bbcf6b1b8c9fb0
tree022cb0b7aa5e1cf4cf9dd527bfb3433560425e8a
parent80b6f3b05967890b03742fb866f7e78457b733eb
parent41d335f31ac71a0c38d214a7120d93ad6d3938cd
Merge branch 'MDL-60920-master' of https://github.com/lucaboesch/moodle