Merge branch '8.x'

# Conflicts:
#	CHANGELOG.md
#	composer.json
This commit is contained in:
Dries Vints
2021-08-10 19:28:02 +02:00
3 changed files with 8 additions and 3 deletions

View File

@@ -6,7 +6,6 @@
"license": "MIT",
"require": {
"php": "^8.0",
"fideloper/proxy": "dev-master",
"fruitcake/laravel-cors": "dev-develop",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^9.0",