Merge branch 'v2'

Conflicts: composer.json
ahsankhatri · Apr 26, 2020 · 68c8d2f · 68c8d2f
2 parents ae4e40f + 37bb9f6
commit 68c8d2f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
  "require": {
  "php": "^7.1",
  "hautelook/phpass": ">=0.3",
- "laravel/framework": ">=5.6 <5.9"
+ "laravel/framework": ">=5.6 <7"
  },
  "autoload": {
  "psr-4": {