Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/.gitignore b/.gitignore
index 8a7f5c65c8cefafbf527fef659146c0647c50566..00383151a6401dfbfde841ba02bceb70845f04fd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,11 @@
 avatar/*
-background/*
 files/*
 file/*
+local/*
 _darcs/*
 logs/*
+log/*
+run/*
 config.php
 .htaccess
 httpd.conf
@@ -23,3 +25,12 @@ config-*.php
 good-config.php
 lac08.log
 php.log
+.DS_Store
+nbproject
+*.mo
+*log*
+htaccess-sample
+installer.txt
+extlib/DB.php
+.gitmodules
+*_plugin/*