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

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

diff --git a/.gitignore b/.gitignore
index 1cde3a6254ad0ce63fd1f8593caa4088184a2c8e..41084c45cd1cf2e0a198bef83e7fffcc2cf1d5ae 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ file/*
 local/*
 _darcs/*
 logs/*
+log/*
+run/*
 config.php
 .htaccess
 httpd.conf
@@ -24,4 +26,7 @@ config-*.php
 good-config.php
 lac08.log
 php.log
+.DS_Store
+nbproject
+*.mo