Merge branch 'versions/2.6.0'

2.6.0 readiness
zendframework · Nov 18, 2015 · e294561 · e294561
2 parents 18450cf + ed0841a
commit e294561
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.6.0 - TBD
+## 2.6.0 - 2015-11-18
 
 ### Added
 
@@ -22,24 +22,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.5.3 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 2.5.2 - 2015-08-05
 
 ### Added

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