Merge branch 'wip-MDL-61424-master' of git://github.com/marinaglancy/moodle
commit2a8830379f4c756082307cfaee29ccda3acd20fd
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 00:18:58 +0000 (7 08:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 00:18:58 +0000 (7 08:18 +0800)
treee3b230f2733610fcf7c79feb93ddf533415af467
parent89763f52267680f35e1ba39587cbf5978f751a65
parent9991670ff9205c002d243c0ea46dae4f0062297c
Merge branch 'wip-MDL-61424-master' of git://github.com/marinaglancy/moodle