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)
tine20/composer.json

index 9abbd18..c4e7d7b 100644 (file)
@@ -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.*",
         "ezyang/htmlpurifier": "v4.6.0",