Merge branch 'master' into 0.9.x

[quix0rs-gnu-social.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 83a53dfa3fef76899d8cf1316800396452f44961..bf491ec3c2ce7e65de1bfdeb1f5ba0e2d7d70786 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 avatar/*
+background/*
 files/*
+file/*
+local/*
 _darcs/*
 logs/*
 config.php
@@ -13,3 +16,14 @@ dataobject.ini
 *.rej
 .#*
 *.swp
+.buildpath
+.project
+.settings
+TODO.rym
+config-*.php
+good-config.php
+lac08.log
+php.log
+.DS_Store
+nbproject
+*.mo