Merge branch 'master' into develop

2020-06-16 14:56:56 +02:00
parent b522e3b301 311c3f823a
commit a429eab2d4
9 changed files with 69 additions and 7 deletions
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
    "require": {
        "php": "^7.2.5",
        "fideloper/proxy": "^4.2",
-        "fruitcake/laravel-cors": "^1.0",
+        "fruitcake/laravel-cors": "^2.0",
        "guzzlehttp/guzzle": "^6.3",
        "laravel/framework": "^8.0",
        "laravel/tinker": "^2.0"