X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=.gitignore;h=3e97aab749aa2dc1ad980d6c8213a7d59e47d2d6;hb=e960a481012b7e4e1df19c26d70b504d738ecd14;hp=b2c4d45cb1931610c8a2b0b32d6597f71e80738b;hpb=24dc5218b18bfa065a101057523f39a9c046d046;p=lhc%2Fweb%2Fwiklou.git

diff --git a/.gitignore b/.gitignore
index b2c4d45cb1..3e97aab749 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,6 @@ node_modules/
 # Composer
 /vendor
 /composer.lock
-/composer.json
 /composer.local.json
 
 # MediaWiki UI documentation
@@ -72,3 +71,4 @@ Thumbs.db
 /.htaccess
 /.htpasswd
 /tests/phan/issues
+*.rej