Merge branch '2016.11' into 2017.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Aug 2017 13:00:20 +0000 (15:00 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Aug 2017 13:00:20 +0000 (15:00 +0200)
1  2 
tine20/composer.json

@@@ -22,9 -22,9 +22,9 @@@
          "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.*",
 +        "syncroton/syncroton": "1.*",
          "ezyang/htmlpurifier": "v4.6.0",
          "phpoffice/phpexcel": "1.8.*",
          "phpoffice/phpword": "v0.13.*",