Merged laravel and laravel5

2015-10-28 08:43:54 +01:00 · 2015-10-28 08:43:54 +01:00 · 1d16414b1f
parent f652ad7627
commit 1d16414b1f
2 changed files with 6 additions and 14 deletions
--- a/Laravel.gitignore
+++ b/Laravel.gitignore
@ -1,10 +1,11 @@
-/bootstrap/compiled.php
+bootstrap/compiled.php
+bootstrap/cache
 .env.*.php
 .env.php
 .env
 .env.example

-/vendor
-/node_modules
-/app/storage
-
+app/storage/
+node_modules/
+storage/
+vendor/
--- a/Laravel5.gitignore
+++ b/Laravel5.gitignore
@ -1,9 +0,0 @@
-bootstrap/cache/
-.env.*.php
-.env.php
-.env
-.env.example
-
-vendor/
-node_modules/
-storage/