Merge branch 'MDL-62488_master' of https://github.com/marxjohnson/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 May 2018 01:29:47 +0000 (09:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 May 2018 01:29:47 +0000 (09:29 +0800)
commit227d6d68a37dcb6f8275d40caf7b88d85057d9d6
treefa1e68de140dcab5e3b3b5b3827ecbdbe37b9774
parentf979e2d418db4044e5f0fd74fd2c1bcbbea9c651
parent3bc65933cf146a46f3e454d7544636efbd7524ab
Merge branch 'MDL-62488_master' of https://github.com/marxjohnson/moodle