Merge branch 'wip-MDL-59800-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Aug 2017 01:08:34 +0000 (09:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Aug 2017 01:08:34 +0000 (09:08 +0800)
commit77c762b3ba9f13159e2ac38aee94a4e02ff0338e
treef1c977a607cf21a72430a4c51e643332bcbb680d
parent34cf57f1d027e2d6b8403f3f98f30cfb6fd4756a
parent1e325797a517185c3390a236de74331c3ac6fcfc
Merge branch 'wip-MDL-59800-master' of git://github.com/marinaglancy/moodle