X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=blobdiff_plain;f=.gitignore;h=b991e115a3741431459363d3ba9734ae9f688d2d;hb=4be81eaa3f2f9f647ca6c99bc23c8453c50156cb;hp=b2c4d45cb1931610c8a2b0b32d6597f71e80738b;hpb=8bb5a6c461c31ee5ce6874548246fc2c520686f6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/.gitignore b/.gitignore
index b2c4d45cb1..b991e115a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,14 +42,15 @@ sftp-config.json
 /StartProfiler.php
 
 # Building & testing
+npm-debug.log
 node_modules/
 /tests/phpunit/phpunit.phar
 
 # Composer
 /vendor
 /composer.lock
-/composer.json
 /composer.local.json
+/composer.phar
 
 # MediaWiki UI documentation
 /docs/kss/static
@@ -72,3 +73,4 @@ Thumbs.db
 /.htaccess
 /.htpasswd
 /tests/phan/issues
+*.rej