Merge branch 'master' of gitorious.org:social/mainline

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

diff --git a/.gitignore b/.gitignore
index f4c2bba5f7af504503ab4a03fa2d3faf50d99b2e..f724ded80816fe670c51be813850d81068f4656c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,11 @@ avatar/*
 background/*
 files/*
 file/*
+local/*
 _darcs/*
 logs/*
+log/*
+run/*
 config.php
 .htaccess
 httpd.conf
@@ -23,4 +26,10 @@ config-*.php
 good-config.php
 lac08.log
 php.log
-config.php.*
+.DS_Store
+nbproject
+*.mo
+*log*
+htaccess-sample
+installer.txt
+extlib/DB.php