Merge pull request #10 from isudakoff/laravel-7.0

Upgrade to Laravel 7.0
grkamil · Mar 8, 2020 · 92eade9 · 92eade9
2 parents e6b858f + 278f777
commit 92eade9
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-vendor/
+.idea/
+vendor/
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
   "require": {
     "php": "^7.1.3",
     "monolog/monolog": "^1.23|^2.0",
-    "laravel/framework": "5.6.*|5.7.*|5.8.*|^6.0"
+    "laravel/framework": "5.6.*|5.7.*|5.8.*|^6.0|^7.0"
   },
   "minimum-stability": "dev",
   "prefer-stable": true,

diff --git a/composer.lock b/composer.lock
-Original file line number
+Diff line change
@@ -1 +1,2 @@
-    vendor/
+    .idea/
+    vendor/