Merge branch 'MDL-61651_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Apr 2018 00:45:30 +0000 (08:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Apr 2018 00:45:30 +0000 (08:45 +0800)
commitc131b9600071d610f2e35276199aeab59848d053
treea10f0ad5270a42489392b6863637b2fe9bc63d54
parentfdf620854688dceea0d0f507290558ae0316e63e
parentda04fb70fab2d3a981452f8f279db6157af9cb41
Merge branch 'MDL-61651_master' of git://github.com/markn86/moodle