Merged Laravel & Lumen + grouped rules

diff --git a/Laravel.gitignore b/Laravel.gitignore
index 2a6c46decbd1a42b2555beba07f56ee5e29ff946..0790dea4239a66a9f890bd27309046bcfd5ccb86 100644 (file)
--- a/Laravel.gitignore
+++ b/Laravel.gitignore
@@ -1,11 +1,14 @@
+vendor/
+node_modules/
+
+# Laravel 4 specific
 bootstrap/compiled.php
+app/storage/
+
+# Laravel 5 & Lumen specific
 bootstrap/cache
+storage/
 .env.*.php
 .env.php
 .env
-.env.example
-
-app/storage/
-node_modules/
-storage/
-vendor/
\ No newline at end of file
+.env.example
\ No newline at end of file

diff --git a/Lumen.gitignore b/Lumen.gitignore
deleted file mode 100644 (file)
index 0e042c2..0000000
--- a/Lumen.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.env.*.php
-.env.php
-.env
-.env.example
-
-vendor/
-node_modules/
-storage/