Merge branch '6.x' into 7.x

driesvints · driesvints · commit 9b21125e3123 · 2020-10-27T16:18:17.000+01:00
# Conflicts:
#	composer.json
diff --git 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",
