Merge branch 'master' into 0.9.x

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

diff --git a/.gitignore b/.gitignore
index 217622c84dcaacd1dc5b08d6d79aea460bbaf548..d84e5e7424e15a4cf2d32820fb456dd37a740541 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ good-config.php
 lac08.log
 php.log
 .DS_Store
+nbproject