Merge branch 'master' into stable

vccw-team · Dec 23, 2016 · b6d00b9 · b6d00b9
2 parents faa2535 + 21b48b5
commit b6d00b9
Show file tree

Hide file tree

Showing 3 changed files with 196 additions and 185 deletions.
diff --git a/composer.json b/composer.json
@@ -14,8 +14,7 @@
         "behat/mink-extension": "~2.2",
         "behat/mink-selenium2-driver": "~1.3.1",
         "phpunit/phpunit": "^5.6",
-        "behat/mink-goutte-driver": "^1.2",
-        "guzzlehttp/guzzle": "^6.2"
+        "behat/mink-goutte-driver": "^1.2"
     },
     "require-dev": {
         "phpspec/phpspec": "^3.1"