Merge pull request #5 from vickzkater/v1.1.1

v1.1.1
vickzkater · Jun 20, 2020 · 9e3c850 · 9e3c850
2 parents d1396d6 + fb13bfe
commit 9e3c850
Show file tree

Hide file tree

Showing 4 changed files with 186 additions and 144 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,6 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
+.DS_Store
+
+/public/uploads/product/
diff --git a/README.md b/README.md
@@ -26,6 +26,13 @@ Username: superadmin
 Password: admin123
 ```
 
+## Version
+
+ Laravel  | Lara-S-CMS
+:---------|:----------
+ 5.8.x    | 1.0.x
+ 6.x.x    | 1.1.1
+
 ## Requirements
 
 - PHP >= 7.2

diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         "php": "^7.1.3",
         "doctrine/dbal": "^2.10",
         "fideloper/proxy": "^4.0",
-        "laravel/framework": "5.8.*",
+        "laravel/framework": "^6.0",
         "laravel/tinker": "^1.0",
         "maatwebsite/excel": "^3.1",
         "symfony/translation": "4.3.8",