Merge branch 'master' into develop

# Conflicts: # CHANGELOG.md # composer.json
2020-10-30 16:09:57 +01:00
parent 0d5d51fb5d 3e9fd59156
commit 1d1dc13d6b
2 changed files with 11 additions and 620 deletions
--- a/composer.json
+++ b/composer.json
@@ -13,13 +13,13 @@
        "fruitcake/laravel-cors": "^2.0.3",
        "guzzlehttp/guzzle": "^7.0.1",
        "laravel/framework": "^9.0",
-        "laravel/tinker": "^2.0|dev-develop"
+        "laravel/tinker": "^2.5|dev-develop"
    },
    "require-dev": {
        "fakerphp/faker": "^1.9.1",
-        "mockery/mockery": "^1.3.1",
+        "mockery/mockery": "^1.4.2",
        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.3"
+        "phpunit/phpunit": "^9.3.3"
    },
    "config": {
        "optimize-autoloader": true,