Update changelog, prepare release

joelwurtz · joelwurtz · commit 1c7c6e5fddaf · 2016-02-25T11:31:40.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,12 @@
 # Change Log
 
-
 ## Unreleased
+
+## 1.1.0
+
+ * Added discovery as hard dependency
+ * Reading more bytes than expected in a stream now returns the remaining content instead of throwing an Error
+
+## 1.0.0
+
+Initial release
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.1-dev"
         }
     },
     "prefer-stable": true,
