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 f2e96d3eb662e89c5938a74382846233c3544726..83a53dfa3fef76899d8cf1316800396452f44961 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
 avatar/*
 files/*
 _darcs/*
+logs/*
 config.php
 .htaccess
+httpd.conf
 *.tmproj
 dataobject.ini
 *~
@@ -10,3 +12,4 @@ dataobject.ini
 *.orig
 *.rej
 .#*
+*.swp