X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=.gitignore;h=01a11bf4115abd854045d13825324e5b0f3de4a8;hb=5132a686838ee43d3037a95d1ca2d65f5c833288;hp=0351cf5d811bde24bf0f9073930137cddfcdc2c8;hpb=b2645d82849ca74b0e6b8df6a3e28e81d0561a58;p=lhc%2Fweb%2Fwiklou.git

diff --git a/.gitignore b/.gitignore
index 0351cf5d81..01a11bf411 100644
--- 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
@@ -41,11 +43,13 @@ sftp-config.json
 
 # Building & testing
 node_modules/
+/tests/phpunit/phpunit.phar
 
 # Composer
 /vendor
 /composer.lock
 /composer.json
+/composer.local.json
 
 # MediaWiki UI documentation
 /docs/kss/static