Merge branch 'versions/1.2.0'

1.2.0 readiness
zendframework · Nov 24, 2015 · edfda00 · edfda00
2 parents 1829cb1 + a1a6ccf
commit edfda00
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.2.0 - TBD
+## 1.2.0 - 2015-11-24
 
 ### Added
 
@@ -34,24 +34,6 @@ All notable changes to this project will be documented in this file, in reverse
   `HtmlResponse` to set the charset to utf-8 by default (if no content type
   header is provided at instantiation).
 
-## 1.1.5 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 1.1.4 - 2015-10-16
 
 ### Added

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