Merge branch 'versions/2.7.0'

2.7.0 readiness
zendframework · Jan 11, 2016 · 0a6b76d · 0a6b76d
2 parents f337d4b + 4dfaf6f
commit 0a6b76d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.7.0 - TBD
+## 2.7.0 - 2016-01-11
 
 ### Added
 

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         }
     },
     "require": {
-        "php": ">=5.5",
+        "php": "^5.5 || ^7.0",
         "container-interop/container-interop": "~1.0"
     },
     "require-dev": {
@@ -31,8 +31,8 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "2.6-dev",
-            "dev-develop": "2.7-dev"
+            "dev-master": "2.7-dev",
+            "dev-develop": "3.0-dev"
         }
     },
     "autoload-dev": {