1 files changed, 4 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index f5a3e0212..83a53dfa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,15 @@
 avatar/*
 files/*
 _darcs/*
+logs/*
 config.php
 .htaccess
+httpd.conf
 *.tmproj
 dataobject.ini
 *~
 *.bak
 *.orig
 *.rej
+.#*
+*.swp