Merge remote-tracking branch 'upstream/master'

ezpublishlegacy · Jun 12, 2017 · 8463f78 · 8463f78
2 parents 3335d94 + 69f46cf
commit 8463f78
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "homepage": "http://share.ez.no",
     "license": "GPL-2.0",
     "require": {
-        "php": ">=5.4.4",
+        "php": "~5.6|~7.0",
         "ezsystems/ezpublish-api": "self.version"
     },
     "autoload": {
@@ -14,7 +14,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.4.x-dev"
+            "dev-master": "6.10.x-dev"
         }
     },
     "target-dir": "eZ/Publish/SPI"