Prepare release

php-http · May 9, 2016 · c7a1c6b · c7a1c6b
1 parent 8b330d3
commit c7a1c6b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,14 @@
 # Change Log
 
-## 1.1.0 (unreleased)
+
+## 1.1.0 - 2016-05-09
 
 ### Added
 
 - Factory method Client::createWithConfig to create an adapter with custom
   configuration for the underlying guzzle client.
 
+
 ## 1.0.0 - 2016-01-26
 
 

diff --git a/composer.json b/composer.json
@@ -43,8 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
-    },
-    "prefer-stable": true
+    }
 }