Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Ivan Lanin 2014-05-21 00:29:39 +07:00
commit 5188b36f22

View File

@ -33,8 +33,7 @@
], ],
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3",
"ext-xml": "*", "ext-xml": "*"
"ext-zip": "*"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "3.7.*", "phpunit/phpunit": "3.7.*",
@ -45,6 +44,7 @@
"mpdf/mpdf": "5.*" "mpdf/mpdf": "5.*"
}, },
"suggest": { "suggest": {
"ext-zip": "Used to create docx files",
"ext-gd2": "Required to add images", "ext-gd2": "Required to add images",
"ext-xmlwriter": "Required to write DOCX and ODT", "ext-xmlwriter": "Required to write DOCX and ODT",
"ext-xsl": "Required to apply XSL style sheet to template part", "ext-xsl": "Required to apply XSL style sheet to template part",