From 1d16414b1f8fe9ca10dd85596103566c663e07c4 Mon Sep 17 00:00:00 2001 From: jerodev Date: Wed, 28 Oct 2015 08:43:54 +0100 Subject: [PATCH] Merged laravel and laravel5 --- Laravel.gitignore | 11 ++++++----- Laravel5.gitignore | 9 --------- 2 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 Laravel5.gitignore diff --git a/Laravel.gitignore b/Laravel.gitignore index 79906c80..2a6c46de 100644 --- 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/ \ No newline at end of file diff --git a/Laravel5.gitignore b/Laravel5.gitignore deleted file mode 100644 index c895d944..00000000 --- a/Laravel5.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -bootstrap/cache/ -.env.*.php -.env.php -.env -.env.example - -vendor/ -node_modules/ -storage/