Merge "Record user login timing"

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

diff --git a/.gitignore b/.gitignore
index 01a11bf..3e97aab 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,6 @@ node_modules/
 # Composer
 /vendor
 /composer.lock
-/composer.json
 /composer.local.json
 
 # MediaWiki UI documentation
@@ -71,3 +70,5 @@ Thumbs.db
 /tags
 /.htaccess
 /.htpasswd
+/tests/phan/issues
+*.rej