Merged laravel and laravel5

1d16414b · jerodev · f652ad76 · 1d16414b · f652ad76
显示空白变更内容
内联并排

Showing with 6 addition and 14 deletion

Laravel.gitignore Laravel.gitignore +6 -5

Laravel5.gitignore Laravel5.gitignore +0 -9

未找到文件。
--- a/Laravel.gitignore
+++ b/Laravel.gitignore
-/bootstrap/compiled.php
+bootstrap/compiled.php
+bootstrap/cache
 .env.*.php
 .env.php
 .env
 .env.example
-/vendor
+app/storage/
-/node_modules
+node_modules/
-/app/storage
+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/