Merge branch 'MDL-62896-master' of git://github.com/k-holland/moodle
commitb426a2840f142f50d855009a8bf1b566d6288f09
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 13 Aug 2018 23:44:04 +0000 (14 07:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 13 Aug 2018 23:44:04 +0000 (14 07:44 +0800)
treeb6bd9ca81388f4f7e5aac9c873f9c2d077c311d0
parent49a973014cf2e5b0ef6010a8b4de64290efa60fa
parent179a9f24db744098667f2fa584571f3d6504cbef
Merge branch 'MDL-62896-master' of git://github.com/k-holland/moodle