Merge branch 'master' into 0.9.x

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

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