Merge branch '0.8.x' into 0.9.x

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

diff --git a/.gitignore b/.gitignore
index a12f1f99e8bb8a66ead79932420ccb46cf763bfa..1cde3a6254ad0ce63fd1f8593caa4088184a2c8e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,27 @@
 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
+