Merge branch 'versions/2.7.0'

2.7.0 readiness
zendframework · Apr 6, 2016 · a236005 · a236005
2 parents 9ff667d + dde23c3
commit a236005
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 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-04-06
 
 ### Added
 
@@ -30,24 +30,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.6.2 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 2.6.1 - 2016-02-08
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -34,8 +34,8 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "2.6-dev",
-            "dev-develop": "2.7-dev"
+            "dev-master": "2.7-dev",
+            "dev-develop": "2.8-dev"
         },
         "zf": {
             "component": "Zend\\Filter",