1.2.0 readiness

weierophinney · weierophinney · commit 52f4ee8a812c · 2016-07-06T14:45:30.000-05:00
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 - 2016-07-06
 
 ### Added
 
diff --git a/composer.json b/composer.json
@@ -19,8 +19,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev",
-            "dev-develop": "1.2-dev"
+            "dev-master": "1.2-dev",
+            "dev-develop": "1.3-dev"
         },
         "zf": {
             "module": "ZF\\ApiProblem"
diff --git a/composer.lock b/composer.lock
