Merge branch 'master' into 0.9.x

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

diff --git a/.gitignore b/.gitignore
index 3418d8ee54d1178448469dd417721c9831c1ea2d..bf491ec3c2ce7e65de1bfdeb1f5ba0e2d7d70786 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 avatar/*
+background/*
 files/*
 file/*
+local/*
 _darcs/*
 logs/*
 config.php
@@ -22,3 +24,6 @@ config-*.php
 good-config.php
 lac08.log
 php.log
+.DS_Store
+nbproject
+*.mo