Merge branch 'master' into 0.9.x

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

diff --git a/.gitignore b/.gitignore
index f2e96d3eb662e89c5938a74382846233c3544726..bf491ec3c2ce7e65de1bfdeb1f5ba0e2d7d70786 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,13 @@
 avatar/*
+background/*
 files/*
+file/*
+local/*
 _darcs/*
+logs/*
 config.php
 .htaccess
+httpd.conf
 *.tmproj
 dataobject.ini
 *~
@@ -10,3 +15,15 @@ dataobject.ini
 *.orig
 *.rej
 .#*
+*.swp
+.buildpath
+.project
+.settings
+TODO.rym
+config-*.php
+good-config.php
+lac08.log
+php.log
+.DS_Store
+nbproject
+*.mo