Merge branch '6.x' into 7.x

# Conflicts:
#	CHANGELOG.md
#	composer.json
This commit is contained in:
Dries Vints
2020-10-30 15:43:30 +01:00
2 changed files with 4 additions and 530 deletions

View File

@@ -9,18 +9,18 @@
"license": "MIT",
"require": {
"php": "^7.2.5|^8.0",
"fideloper/proxy": "^4.2",
"fideloper/proxy": "^4.4",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^6.3",
"laravel/framework": "^7.29",
"laravel/tinker": "^2.0"
"laravel/tinker": "^2.5"
},
"require-dev": {
"facade/ignition": "^2.0",
"fakerphp/faker": "^1.9.1",
"mockery/mockery": "^1.3.1",
"nunomaduro/collision": "^4.1",
"phpunit/phpunit": "^8.5|^9.3"
"phpunit/phpunit": "^8.5.8|^9.3.3",
},
"config": {
"optimize-autoloader": true,