Merge "Reduced contention slam potential in User::invalidateCache()."

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

diff --git a/.gitignore b/.gitignore
index 07c3175..fb2b81b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 .svn
 *~
+*.kate-swp
+.*.swp
 .classpath
 .idea
 .metadata*
@@ -17,8 +19,12 @@ static*
 tags
 cache/*.cdb
 images/[0-9a-f]
+images/archive
+images/deleted
 images/temp
 images/thumb
-maintenance/dev/data/
+images/timeline
+images/tmp
+maintenance/dev/data
 maintenance/.mweval_history
 maintenance/.mwsql_history