Merge branch '1.9' into 1.9merge
This commit is contained in:
commit
ca7692834d
|
@ -24,7 +24,8 @@
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.4.0",
|
"php": ">=5.4.0",
|
||||||
"ext-xml": "*",
|
"ext-xml": "*",
|
||||||
"ext-xmlwriter": "*"
|
"ext-xmlwriter": "*",
|
||||||
|
"pclzip/pclzip": "2.8.2"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"squizlabs/php_codesniffer": "2.*",
|
"squizlabs/php_codesniffer": "2.*",
|
||||||
|
|
Loading…
Reference in New Issue