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

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

diff --git a/.gitignore b/.gitignore
index f4c2bba5f7af504503ab4a03fa2d3faf50d99b2e..217622c84dcaacd1dc5b08d6d79aea460bbaf548 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ avatar/*
 background/*
 files/*
 file/*
+local/*
 _darcs/*
 logs/*
 config.php
@@ -23,4 +24,4 @@ config-*.php
 good-config.php
 lac08.log
 php.log
-config.php.*
+.DS_Store