Merge branch 'versions/2.2.0'

2.2.0 readiness
zendframework · Apr 6, 2016 · e530a90 · e530a90
2 parents 102a015 + 33ce1f5
commit e530a90
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.2.0 - TBD
+## 2.2.0 - 2016-04-06
 
 ### Added
 
@@ -30,24 +30,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.1.1 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 2.1.0 - 2016-02-18
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -37,8 +37,8 @@
         "branch-alias": {
             "dev-release-1.0": "1.0-dev",
             "dev-release-1.1": "1.1-dev",
-            "dev-master": "2.1-dev",
-            "dev-develop": "2.2-dev"
+            "dev-master": "2.2-dev",
+            "dev-develop": "2.3-dev"
         },
         "zf": {
             "component": "Zend\\Hydrator",