Merge "Move MimeAnalyzer params to ServiceWiring"

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

diff --git a/.gitignore b/.gitignore
index 93c429f..01a11bf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 .project
 cscope.files
 cscope.out
+*.orig
 ## NetBeans
 nbproject*
 project.index
@@ -25,6 +26,7 @@ sftp-config.json
 /docs/js
 /images/[0-9a-f]
 /images/archive
+/images/cache
 /images/deleted
 /images/lockdir
 /images/temp
@@ -47,6 +49,7 @@ node_modules/
 /vendor
 /composer.lock
 /composer.json
+/composer.local.json
 
 # MediaWiki UI documentation
 /docs/kss/static