Merge branch '6.x' into 7.x

# Conflicts: # composer.json
2020-10-27 16:18:17 +01:00
parent 533f130f14 4c25cb953a
commit 9b21125e31
1 changed files with 1 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
    ],
    "license": "MIT",
    "require": {
-        "php": "^7.2.5",
+        "php": "^7.2.5|^8.0",
        "fideloper/proxy": "^4.2",
        "fruitcake/laravel-cors": "^2.0",
        "guzzlehttp/guzzle": "^6.3",