Merge branch '1.9' into 1.9merge

2015-07-08 22:25:37 +01:00 · 2015-07-08 22:25:37 +01:00 · ca7692834d
parent daf2482dd6 d9cbaa3090
commit ca7692834d
1 changed files with 2 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@ -24,7 +24,8 @@
    "require": {
        "php": ">=5.4.0",
        "ext-xml": "*",
-        "ext-xmlwriter": "*"
+        "ext-xmlwriter": "*",
+        "pclzip/pclzip": "2.8.2"
    },
    "require-dev": {
        "squizlabs/php_codesniffer": "2.*",