Merge pull request #82 from php-http/prepare-for-new-release

dbu · web-flow · commit 2cbe708f5a09 · 2016-10-20T09:27:51.000+02:00
Prepare for new release
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
 
 ## Unreleased
 
+## 1.1.0 - 2016-10-20
+
 ### Added
 
 - Discovery support for Slim Framework factories
diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.2-dev"
         }
     },
     "prefer-stable": true,
