Merge branch 'release/2.10.0'

zendframework · Jul 5, 2018 · b63c788 · b63c788
2 parents b89592a + 558f9d1
commit b63c788
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.10.0 - TBD
+## 2.10.0 - 2018-07-05
 
 ### Added
 
@@ -22,24 +22,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 - [#51](https://github.com/zendframework/zend-ldap/issues/51) Use ldap_escape to escape values instead of own function - Thanks to @KaelBaldwin
 
-## 2.9.1 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 2.9.0 - 2018-04-25
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -45,8 +45,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.9.x-dev",
-            "dev-develop": "2.10.x-dev"
+            "dev-master": "2.10.x-dev",
+            "dev-develop": "2.11.x-dev"
         }
     },
     "scripts": {