Prepare release

php-http · May 4, 2016 · 1c09aab · 1c09aab
1 parent 556647f
commit 1c09aab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-## Unreleased
+## 1.1.0 - 2016-05-04
 
 ### Added
 

diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.2-dev"
         }
     }
 }