Skip to content

Commit

Permalink
Merge pull request php-http#29 from php-http/stable_release
Browse files Browse the repository at this point in the history
Prepare stable release
  • Loading branch information
sagikazarmark committed Jan 26, 2016
2 parents 459fa6e + 5056c3b commit e884cf6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Change Log


## 1.0.0 - 2016-01-26


## 0.4.1 - 2016-01-13

### Changed
Expand Down
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,19 @@ $ composer require php-http/guzzle6-adapter

## Documentation

Please see the [official documentation](http://docs.httplug.io).
Please see the [official documentation](http://docs.php-http.org).


## Testing

First launch the http server:

```bash
$ ./vendor/bin/http_test_server > /dev/null 2>&1 &
```

Then the test suite:

``` bash
$ composer test
```
Expand All @@ -38,8 +46,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 [[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]).


## Credits
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"require-dev": {
"ext-curl": "*",
"php-http/adapter-integration-tests": "^0.2"
"php-http/adapter-integration-tests": "^0.3"
},
"provide": {
"php-http/client-implementation": "1.0",
Expand All @@ -43,9 +43,9 @@
},
"extra": {
"branch-alias": {
"dev-master": "0.5-dev"
"dev-master": "1.1-dev"
}
},
"prefer-stable": true,
"minimum-stability": "dev"
"minimum-stability": "beta"
}

0 comments on commit e884cf6

Please sign in to comment.