Merge branch 'MDL-61995-master' of git://github.com/zig-moodle/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Apr 2018 00:15:38 +0000 (08:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Apr 2018 00:15:38 +0000 (08:15 +0800)
commitfdf620854688dceea0d0f507290558ae0316e63e
treea8efdb0a93b991b6ce90d63aecf6da824e5ceb59
parent5e488f8c227f2c7ee29aff2253ca5f8ddcd5e946
parentf8555ac9aa2a965973ed551610bacfa0e84fda60
Merge branch 'MDL-61995-master' of git://github.com/zig-moodle/moodle