Merge branch 'master' into develop

2019-03-12 17:23:52 +01:00
parent 53b59cd0ba 4997f08105
commit cfd5929785
9 changed files with 29 additions and 8 deletions
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
        "filp/whoops": "^2.0",
        "fzaninotto/faker": "^1.4",
        "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^2.0",
+        "nunomaduro/collision": "^3.0",
        "phpunit/phpunit": "^8.0"
    },
    "config": {