summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElmer Thomas <elmer@thinkingserious.com>2016-11-17 14:45:31 -0800
committerElmer Thomas <elmer@thinkingserious.com>2016-11-17 14:45:31 -0800
commit3c4c35eafd364ebcfdbb0a37f655417beed8ee0f (patch)
tree4aabaab628093fda7855faa8b926d703c7a8674f
parent7e29e6b7333a2f8951a9dd2b0f1f9f98adc89123 (diff)
downloadphp-http-client-origin/HEAD.zip
php-http-client-origin/HEAD.tar.gz
php-http-client-origin/HEAD.tar.bz2
Version Bump v3.5.1: Pull request #13, fixed issue #12HEADv3.5.1origin/masterorigin/HEADmaster
-rw-r--r--CHANGELOG.md5
-rw-r--r--README.md2
-rw-r--r--composer.json2
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63d6261..9e050d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
+## [3.5.1] - 2016-11-17
+### Fixed
+- Pull request #13, fixed issue #12: [Change from to php union operator to combine curl options](https://github.com/sendgrid/php-http-client/pull/13)
+- Thanks to [emil](https://github.com/emilva) for the pull request!
+
## [3.5.0] - 2016-10-18
### Added
- Pull request #11: [Added curlOptions property to customize curl instance](https://github.com/sendgrid/php-http-client/pull/11)
diff --git a/README.md b/README.md
index 22fa71a..46a6f35 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Add php-http-client to your `composer.json` file. If you are not using [Composer
```json
{
"require": {
- "sendgrid/php-http-client": "3.5"
+ "sendgrid/php-http-client": "3.5.1"
}
}
```
diff --git a/composer.json b/composer.json
index 2ecb3c7..bb7c6ad 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"name": "sendgrid/php-http-client",
"description": "HTTP REST client, simplified for PHP",
"type": "library",
- "version": "3.5.0",
+ "version": "3.5.1",
"require-dev": {
"phpunit/phpunit": "~4.4",
"squizlabs/php_codesniffer": "~2.0"