Merge branch 'versions/2.6.0'

2.6.0 readiness
zendframework · Feb 18, 2016 · b3b0432 · b3b0432
2 parents bf28d0f + b5fdd73
commit b3b0432
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,23 +22,6 @@ All notable changes to this project will be documented in this file, in reverse
   [#95](https://github.com/zendframework/zend-inputfilter/pull/95), and
   [#96](https://github.com/zendframework/zend-inputfilter/pull/96) update the
   component to be forwards-compatible with zend-servicemanager v3.
-
-## 2.5.6 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
 - [#72](https://github.com/zendframework/zend-inputfilter/pull/72) `ArrayInput`
   value is properly reset after `BaseInputFilter::setData()`
 

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