Merge branch '2016.11' into 2017.11
[tine20] / tine20 / composer.json
index abdafe7..c4e7d7b 100644 (file)
@@ -24,7 +24,7 @@
     "require": {
         "zendframework/zendframework1": "1.12.20pl15 as 1.12.20",
         "tine20/composerapploader": "1.0.*",
-        "syncroton/syncroton": "1.3.*",
+        "syncroton/syncroton": "1.*",
         "ezyang/htmlpurifier": "v4.6.0",
         "phpoffice/phpexcel": "1.8.*",
         "phpoffice/phpword": "v0.13.*",
@@ -34,7 +34,8 @@
         "metaways/timezoneconvert": "1.*",
         "zendframework/zend-http": "2.4.*",
         "doctrine/orm": "2.5.*",
-        "twig/twig": "~1.0"
+        "twig/twig": "~1.0",
+        "phpoffice/phpspreadsheet": "dev-master"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",