New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Laravel 5.6 Shift #1

Merged
merged 6 commits into from Feb 9, 2018
File filter...
Filter file types
Jump to file or symbol
Failed to load files and symbols.
+11 −8
Diff settings

Always

Just for now

Shift Laravel dependencies

  • Loading branch information...
laravel-shift committed Feb 9, 2018
commit f8464c2ad5b3e61540dddfe207e7203c5687745e
Copy path View file
@@ -1,21 +1,25 @@
{
"name": "laravel/laravel",
"description": "The Laravel Framework.",
"keywords": ["framework", "laravel"],
"keywords": [
"framework",
"laravel"
],
"license": "MIT",
"type": "project",
"require": {
"php": ">=7.0.0",
"fideloper/proxy": "~3.3",
"laravel/framework": "5.5.*",
"php": ">=7.1.3",
"fideloper/proxy": "~4.0",
"laravel/framework": "5.6.*",
"laravel/tinker": "~1.0"
},
"require-dev": {
"filp/whoops": "~2.0",
"fzaninotto/faker": "~1.4",
"mockery/mockery": "~1.0",
"phpunit/phpunit": "~6.0",
"symfony/thanks": "^1.0"
"symfony/thanks": "^1.0",
"nunomaduro/collision": "~1.1"
},
"autoload": {
"classmap": [
@@ -33,8 +37,7 @@
},
"extra": {
"laravel": {
"dont-discover": [
]
"dont-discover": []
}
},
"scripts": {
@@ -54,4 +57,4 @@
"sort-packages": true,
"optimize-autoloader": true
}
}
}
ProTip! Use n and p to navigate between commits in a pull request.