diff --git a/CHANGELOG.md b/CHANGELOG.md index 635de5f8..805f9101 100644 --- 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-07-23 ### Added @@ -20,24 +20,6 @@ All notable changes to this project will be documented in this file, in reverse ### Fixed -- Nothing. - -## 2.5.2 - TBD - -### Added - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - - [#3](https://github.com/zendframework/zend-servicemanager/pull/3) properly updates the codebase to PHP 5.5, by taking advantage of the default closure binding (`$this` in a closure is the invoking object when created within a method). It diff --git a/composer.json b/composer.json index 4376a1ef..9fcd66a7 100644 --- 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": {