Merged laravel and laravel5

1d16414b · jerodev · f652ad76 · 1d16414b · f652ad76
Commit 1d16414b authored Oct 28, 2015 by jerodev
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 14 deletions

Laravel.gitignore Laravel.gitignore +6 -5

Laravel5.gitignore Laravel5.gitignore +0 -9

No files found.
--- a/Laravel.gitignore
+++ b/Laravel.gitignore
-/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/
\ No newline at end of file
--- a/Laravel5.gitignore
+++ b/Laravel5.gitignore
-bootstrap/cache/
-.env.*.php
-.env.php
-.env
-.env.example
-
-vendor/
-node_modules/
-storage/