Merge branch '8.x'

# Conflicts: # CHANGELOG.md
2021-01-05 16:49:44 +01:00
parent 919ea4ceb2 f9f39ee7ac
commit c6059645a6
3 changed files with 19 additions and 12 deletions
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
    },
    "require-dev": {
        "fakerphp/faker": "^1.9.1",
-        "laravel/sail": "^0.0.5",
+        "laravel/sail": "^1.0.1",
        "mockery/mockery": "^1.4.2",
        "nunomaduro/collision": "^5.0",
        "phpunit/phpunit": "^9.3.3"