Merge "Gruntfile.js: Remove obsolete eslint omissions"

[lhc/web/wiklou.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b1649df..3e97aab 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ sftp-config.json
 /docs/js
 /images/[0-9a-f]
 /images/archive
+/images/cache
 /images/deleted
 /images/lockdir
 /images/temp
@@ -47,7 +48,6 @@ node_modules/
 # Composer
 /vendor
 /composer.lock
-/composer.json
 /composer.local.json
 
 # MediaWiki UI documentation
@@ -70,3 +70,5 @@ Thumbs.db
 /tags
 /.htaccess
 /.htpasswd
+/tests/phan/issues
+*.rej