Merge branch 'MDL-58272-master-2' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 11 Dec 2017 06:58:14 +0000 (14:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 11 Dec 2017 06:58:14 +0000 (14:58 +0800)
commit10cc00b4af299e2858d08ac16734a8ade38ec621
treef06b4bd1a3d6eb2abef35fe54cd84e3b9ed50b40
parent67c0e18ca2895ed5ab4d4d1d376959b8c4d93a75
parent46878ed87f7b7018c8e3e7b72d9ae0db248773e9
Merge branch 'MDL-58272-master-2' of https://github.com/snake/moodle