Merge commit 'refs/merge-requests/41' of https://gitorious.org/social/mainline into...

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

diff --git a/.gitignore b/.gitignore
index 5394f5eac54a0c4884d6756b3cc7b31e4df0fe08..41084c45cd1cf2e0a198bef83e7fffcc2cf1d5ae 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,7 @@ config-*.php
 good-config.php
 lac08.log
 php.log
+.DS_Store
+nbproject
+*.mo