Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x

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

diff --git a/.gitignore b/.gitignore
index 0c0fde801083ba30cca5f22c95842e3d99032306..83a53dfa3fef76899d8cf1316800396452f44961 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,15 @@
 avatar/*
 files/*
 _darcs/*
+logs/*
 config.php
 .htaccess
+httpd.conf
 *.tmproj
 dataobject.ini
+*~
+*.bak
+*.orig
+*.rej
+.#*
+*.swp