Merge branch '2.0'

# Conflicts: # composer.lock
2015-12-11 11:43:15 +00:00
parent 37598fac3d 409d34f251
commit 821870f496
2 changed files with 9 additions and 9 deletions
--- a/composer.json
+++ b/composer.json
@@ -43,8 +43,8 @@
        "filp/whoops": "^1.1",
        "fzaninotto/faker": "^1.5",
        "graham-campbell/testbench-core": "^1.1",
-        "mockery/mockery": "^0.9.4",
-        "phpunit/phpunit": "^4.8"
+        "mockery/mockery": "0.9.4",
+        "phpunit/phpunit": "4.8.19"
    },
    "autoload": {
        "classmap": [