Merge branch '5.1' into 5.2

# Conflicts: # composer.json
forked-repo · Apr 18, 2016 · 8cba3e3 · 8cba3e3
2 parents b40fdc5 + e0dbdc2
commit 8cba3e3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -72,7 +72,7 @@
     },
     "require-dev": {
         "aws/aws-sdk-php": "~3.0",
-        "mockery/mockery": "~0.9.2",
+        "mockery/mockery": "~0.9.4",
         "pda/pheanstalk": "~3.0",
         "phpunit/phpunit": "~4.1",
         "predis/predis": "~1.0",