1.2.0 readiness

Author: weierophinney

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 - 2016-08-11
 
 ### Added
 
@@ -24,24 +24,6 @@ All notable changes to this project will be documented in this file, in reverse
   introduced in that version. The changes should have no effect on existing
   code, except that they will result in dependency updates.
 
-## 1.1.1 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 1.1.0 - 2016-03-09
 
 ### Added

composer.json

@@ -13,8 +13,8 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev",
-            "dev-develop": "1.2-dev"
+            "dev-master": "1.2-dev",
+            "dev-develop": "1.3-dev"
         }
     },
     "require": {