Merge branch 'master' into develop

# Conflicts: # composer.json
2020-10-27 16:19:11 +01:00
parent d1c60201e8 b322096379
commit 554c079988
1 changed files with 1 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
    ],
    "license": "MIT",
    "require": {
-        "php": "^7.3",
+        "php": "^7.3|^8.0",
        "fideloper/proxy": "^4.4.1",
        "fruitcake/laravel-cors": "^2.0.3",
        "guzzlehttp/guzzle": "^7.0.1",