Merge branch 'master' into develop

# Conflicts: # composer.json
2020-10-27 15:03:43 +01:00
parent 445ca935c6 8bfecacf8c
commit d1c60201e8
3 changed files with 4 additions and 4 deletions
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
        "laravel/tinker": "^2.0|dev-develop"
    },
    "require-dev": {
-        "fzaninotto/faker": "^1.9.1",
+        "fakerphp/faker": "^1.9.1",
        "mockery/mockery": "^1.3.1",
        "nunomaduro/collision": "^5.0",
        "phpunit/phpunit": "^9.3"