Merge branch 'versions/1.1.0'

1.1.0 readiness
zendframework · Mar 9, 2016 · 0fd6c5f · 0fd6c5f
2 parents 38676c8 + 7d0960f
commit 0fd6c5f
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.
 
-## 1.1.0 - TBD
+## 1.1.0 - 2016-03-09
 
 ### Added
 
@@ -21,24 +21,6 @@ All notable changes to this project will be documented in this file, in reverse
 - [#6](https://github.com/zendframework/zend-expressive-zendrouter/pull/6)
   updates the component to depend on zend-router instead of zend-mvc.
 
-## 1.0.2 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 1.0.1 - 2016-01-04
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -13,8 +13,8 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev",
-            "dev-develop": "1.1-dev"
+            "dev-master": "1.1-dev",
+            "dev-develop": "1.2-dev"
         }
     },
     "require": {