Merge branch 'MDL-62009-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 May 2018 04:15:54 +0000 (12:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 May 2018 04:15:54 +0000 (12:15 +0800)
commitd28429859e5a5ca1612a14bc81f51a675120d60b
treefae9c0b2e4c26c9fcd16a51c10c1dee6be8372e3
parentbacaac3a12bc061b62b8d03b2d666b14e8ba45ec
parent3fcfc19743f5187a1ebe16677f29259ebe97b1c6
Merge branch 'MDL-62009-master' of git://github.com/FMCorz/moodle