Merge branch 'MDL-60826-master' of git://github.com/lameze/moodle
commit834054ee06dfb1629359d1e895483abf626abc5d
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Jul 2018 01:18:53 +0000 (25 09:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Jul 2018 01:18:53 +0000 (25 09:18 +0800)
tree7983b6d2c5d456059c0d0ef1762503f48d0a163f
parentc46919aa91abffce8715b8e5c811f158b2294f52
parent687112af223293ab3ee108c07ab0eb4a636d5392
Merge branch 'MDL-60826-master' of git://github.com/lameze/moodle