Merge branch 'MDL-61881-master' of git://github.com/zig-moodle/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Apr 2018 02:14:03 +0000 (10:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Apr 2018 02:14:03 +0000 (10:14 +0800)
commit8badf713254873ccddbbb1f6b563041f01c8d716
treeb19f48d7acd225d7f318b953dbae7a9096ce81c8
parentda16e3e3dcfbd958f3a36576d6d8d3f660b39bd6
parent6f77c097770adeb9d47f97d891853962f01ea448
Merge branch 'MDL-61881-master' of git://github.com/zig-moodle/moodle