Skip to content
This repository was archived by the owner on Apr 1, 2021. It is now read-only.

Commit 79c099c

Browse files
committed
Merge branch 'feature/upgrade-laravel-5.7' into develop
2 parents 86dd782 + 2525dbe commit 79c099c

File tree

165 files changed

+1870
-3700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+1870
-3700
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ Homestead.yaml
1616
npm-debug.log
1717
yarn-error.log
1818
.env
19+
.DS_Store

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"php": "^7.1.3",
99
"fideloper/proxy": "^4.0",
1010
"guzzlehttp/guzzle": "^6.3",
11-
"laravel/framework": "5.6.*",
11+
"laravel/framework": "5.7.*",
1212
"laravel/tinker": "^1.0"
1313
},
1414
"require-dev": {

composer.lock

Lines changed: 249 additions & 235 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)