Merge branch 'master' into 0.9.x

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

diff --git a/.gitignore b/.gitignore
index 0c0fde801083ba30cca5f22c95842e3d99032306..bf491ec3c2ce7e65de1bfdeb1f5ba0e2d7d70786 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,29 @@
 avatar/*
+background/*
 files/*
+file/*
+local/*
 _darcs/*
+logs/*
 config.php
 .htaccess
+httpd.conf
 *.tmproj
 dataobject.ini
+*~
+*.bak
+*.orig
+*.rej
+.#*
+*.swp
+.buildpath
+.project
+.settings
+TODO.rym
+config-*.php
+good-config.php
+lac08.log
+php.log
+.DS_Store
+nbproject
+*.mo