Merge branch 'versions/2.6.0'

2.6.0 readiness
zendframework · Feb 23, 2016 · 7feebb6 · 7feebb6
2 parents db365f4 + 15a11e8
commit 7feebb6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,23 +27,6 @@ All notable changes to this project will be documented in this file, in reverse
 - [#29](https://github.com/zendframework/zend-session/pull/29) updates the code
   to be forwards compatible with the v3 releases of zend-eventmanager and
   zend-servicemanager.
-
-## 2.5.3 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
 - [#7](https://github.com/zendframework/zend-session/pull/7) Mongo save handler
   was using sprintf formatting without sprintf.
 

diff --git a/composer.json b/composer.json
@@ -38,8 +38,8 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5-dev",
-            "dev-develop": "2.6-dev"
+            "dev-master": "2.6-dev",
+            "dev-develop": "2.7-dev"
         }
     },
     "autoload-dev": {