Merge branch '2016.11' into 2016.11-develop
authorjenkins <tine20-jenkins@metaways.de>
Thu, 3 Aug 2017 14:48:27 +0000 (16:48 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Thu, 3 Aug 2017 14:48:27 +0000 (16:48 +0200)
1  2 
tine20/composer.json

diff --combined tine20/composer.json
@@@ -22,7 -22,7 +22,7 @@@
          "url": "http://git.syncroton.org/Syncroton"
      }],
      "require": {
-         "zendframework/zendframework1": "1.12.20pl14 as 1.12.20",
+         "zendframework/zendframework1": "1.12.20pl15 as 1.12.20",
          "tine20/composerapploader": "1.0.*",
          "syncroton/syncroton": "1.3.*",
          "ezyang/htmlpurifier": "v4.6.0",
@@@ -34,8 -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.*",