Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

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

diff --git a/.gitignore b/.gitignore
index da6947bfdc3f27978ab534a07be6a96a4797a6ef..217622c84dcaacd1dc5b08d6d79aea460bbaf548 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 avatar/*
+background/*
 files/*
+file/*
+local/*
 _darcs/*
 logs/*
 config.php
@@ -16,3 +19,9 @@ dataobject.ini
 .buildpath
 .project
 .settings
+TODO.rym
+config-*.php
+good-config.php
+lac08.log
+php.log
+.DS_Store