Merge branch 'MDL-60579-master-fix2' of https://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 9 Nov 2017 03:18:14 +0000 (11:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 9 Nov 2017 03:18:14 +0000 (11:18 +0800)
commit5518a32de5598d906e08f81e2d96229471824b1c
treeec94beaaa9862b109173e4bf4a866a1aa404c510
parented0e2cea00a78429a2c1431947dd7781efc92540
parent56f05f23c6125f7529499d1323c44f1e2ed28726
Merge branch 'MDL-60579-master-fix2' of https://github.com/damyon/moodle