Merge branch 'MDL-70579-310' of git://github.com/paulholden/moodle into MOODLE_310_STABLE
commit975c9f7a825071954f0ef8613e257df7b1afd7cd
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 Feb 2021 01:30:20 +0000 (4 09:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 Feb 2021 01:30:20 +0000 (4 09:30 +0800)
tree93c5c1c4f70f929b43c456ad2e808b8fdc7a9283
parentadc56c3df046f68cb8de1f2b9ad9617482fd5a7c
parentb8948751f9f1bf81696913c152196894d6bd69b9
Merge branch 'MDL-70579-310' of git://github.com/paulholden/moodle into MOODLE_310_STABLE
lib/classes/content/export/zipwriter.php