Merge commit '4430658932762ead3661231492b8074f144ea4b6' into influxdb-php

Conflicts:
	lib/influxdb-php/.gitignore
	lib/influxdb-php/README.md
This commit is contained in:
Dave Bell
2016-03-29 23:06:15 +01:00
29 changed files with 2085 additions and 348 deletions
+7 -2
View File
@@ -19,14 +19,19 @@
{
"name": "Daniel Martinez",
"email": "danimartcas@hotmail.com"
},
{
"name": "Gianluca Arbezzano",
"email": "gianarb92@gmail.com"
}
],
"require": {
"php": ">=5.5",
"php": "^5.5 | ^7.0",
"guzzlehttp/guzzle": "6.*",
"symfony/event-dispatcher": "2.*"
"symfony/event-dispatcher": "2.*|3.*"
},
"require-dev": {
"phpunit/phpunit": "^4.0",
"codeclimate/php-test-reporter": "0.*",
"symfony/config": "~2.8",
"symfony/console": "~2.8",