Merge branch 'versions/2.6.0'

2.6.0 readiness
zendframework · Feb 17, 2016 · b937884 · b937884
2 parents a0cc4ba + 60aa116
commit b937884
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,24 +21,6 @@ All notable changes to this project will be documented in this file, in reverse
 - [#18](https://github.com/zendframework/zend-file/pull/18) updates the codebase
   to be forwards compatible with zend-servicemanager and zend-stdlib v3.
 
-## 2.5.3 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 2.5.2 - 2016-02-16
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -34,8 +34,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": {