Merge branch 'versions/1.2.0'

1.2.0 readiness
zendframework · Mar 17, 2016 · e59179d · e59179d
2 parents 3795010 + 0575d43
commit e59179d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ Versions prior to 1.0 were originally released as `phly/conduit`; please visit
 its [CHANGELOG](https://github.com/phly/conduit/blob/master/CHANGELOG.md) for
 details.
 
-## 1.2.0 - TBD
+## 1.2.0 - 2016-03-17
 
 This release contains two potential backwards compatibility breaks:
 

diff --git a/composer.json b/composer.json
@@ -15,12 +15,12 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.0-dev",
-      "dev-develop": "1.1-dev"
+      "dev-master": "1.2-dev",
+      "dev-develop": "1.3-dev"
     }
   },
   "require": {
-    "php": ">=5.4.8",
+    "php": "^5.4.8 || ^7.0",
     "psr/http-message": "~1.0.0",
     "zendframework/zend-escaper": "~2.3"
   },