Merge branch '7.x'

# Conflicts: # composer.json # resources/views/welcome.blade.php
2020-10-27 15:02:56 +01:00
parent bec982b0a3 533f130f14
commit 8bfecacf8c
2 changed files with 3 additions and 3 deletions
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
    },
    "require-dev": {
        "facade/ignition": "^2.3.6",
-        "fzaninotto/faker": "^1.9.1",
+        "fakerphp/faker": "^1.9.1",
        "mockery/mockery": "^1.3.1",
        "nunomaduro/collision": "^5.0",
        "phpunit/phpunit": "^9.3"