Merge branch 'conversationtree' into 0.8.x

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

diff --git a/.gitignore b/.gitignore
index 8c94886e7cdaf2ba87bb1008f5e977af90f4c48c..da6947bfdc3f27978ab534a07be6a96a4797a6ef 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,18 @@
 avatar/*
 files/*
 _darcs/*
+logs/*
 config.php
 .htaccess
+httpd.conf
 *.tmproj
 dataobject.ini
 *~
 *.bak
+*.orig
+*.rej
+.#*
+*.swp
+.buildpath
+.project
+.settings