Merge remote-tracking branch 'github.com/6.x' into bugfix/route-arrays

shin1x1 · Apr 17, 2020 · ae9f533 · ae9f533
2 parents 6906174 + 64f2268
commit ae9f533
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -18,15 +18,15 @@
  }
  ],
  "require": {
- "php": ">=7.2",
- "illuminate/http": "^6.0",
- "illuminate/routing": "^6.0",
- "illuminate/session": "^6.0",
- "illuminate/support": "^6.0",
- "illuminate/view": "^6.0"
+ "php": ">=7.2.5",
+ "illuminate/http": "^6.0|^7.0",
+ "illuminate/routing": "^6.0|^7.0",
+ "illuminate/session": "^6.0|^7.0",
+ "illuminate/support": "^6.0|^7.0",
+ "illuminate/view": "^6.0|^7.0"
  },
  "require-dev": {
- "illuminate/database": "^6.0",
+ "illuminate/database": "^6.0|^7.0",
  "mockery/mockery": "~1.0",
  "phpunit/phpunit": "~7.1"
  },