Merge pull request #109 from php-http/stable_release

sagikazarmark · sagikazarmark · commit 2061047ca53a · 2016-01-26T15:34:50.000+01:00
Prepare stable release
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log
 
 
+## 1.0.0 - 2016-01-26
+
+### Removed
+
+- Stability configuration from composer
+
+
 ## 1.0.0-RC1 - 2016-01-12
 
 ### Changed
diff --git a/README.md b/README.md
@@ -49,8 +49,7 @@ Please see our [contributing guide](http://docs.php-http.org/en/latest/developme
 
 ## Security
 
-If you discover any security related issues, please contact us at [security@httplug.io](mailto:security@httplug.io)
-or [security@php-http.org](mailto:security@php-http.org).
+If you discover any security related issues, please contact us at [security@php-http.org](mailto:security@php-http.org).
 
 
 ## License
diff --git a/composer.json b/composer.json
@@ -34,9 +34,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.1-dev"
         }
-    },
-    "prefer-stable": true,
-    "minimum-stability": "RC"
+    }
 }

-Original file line number
+Diff line change
 ## Security
 -If you discover any security related issues, please contact us at [[email protected]](mailto:[email protected])
 -or [[email protected]](mailto:[email protected]).
 +If you discover any security related issues, please contact us at [[email protected]](mailto:[email protected]).
 ## License