Merge pull request #39 from okaufmann/master

Allow use of Guzzle 6.0

Merge pull request #39 from okaufmann/master
Allow use of Guzzle 6.0
cefe29e9 · Taylor Otwell · f0d5e2df · 4945fcc2 · cefe29e9 · cefe29e9
Commit cefe29e9 authored Nov 13, 2015 by Taylor Otwell
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 107 additions and 91 deletions

composer.json composer.json +1 -1

composer.lock composer.lock +106 -90

No files found.
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
        }
    },
    "require": {
-        "guzzlehttp/guzzle": "~4.0|~5.0",
+        "guzzlehttp/guzzle": "~4.0|~5.0|~6.0",
        "symfony/console": "~2.3",
        "symfony/process": "~2.3"
    },

--- a/composer.lock
+++ b/composer.lock