Merge branch 'master' into 0.9.x

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

diff --git a/.gitignore b/.gitignore
index 1cde3a6254ad0ce63fd1f8593caa4088184a2c8e..d84e5e7424e15a4cf2d32820fb456dd37a740541 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,5 @@ config-*.php
 good-config.php
 lac08.log
 php.log
-
+.DS_Store
+nbproject