Merge remote-tracking branch 'origin/master' into develop

cloak-php · May 29, 2015 · b660335 · b660335
2 parents 1054d00 + 06aa4fd
commit b660335
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
     "require": {
         "php": ">=5.5.0",
         "phpcollection/phpcollection": "~0.4",
-        "guzzlehttp/guzzle": "~5.2",
+        "guzzlehttp/guzzle": "~5.3",
         "gitonomy/gitlib": "~0.1",
         "yosymfony/toml": "~0.3",
         "symfony/dom-crawler": "~2.6",
@@ -20,7 +20,7 @@
     "require-dev": {
         "phpspec/prophecy": "~1.4",
         "peridot-php/peridot": "~1.15",
-        "expect/peridot-expect-plugin": "~2.0",
+        "expect/peridot-expect-plugin": "~3.0",
         "cloak/peridot-cloak-plugin": "~2.0",
         "holyshared/robo-peridot": "~2.0",
         "codegyre/robo": "~0.5",