Merge branch 'master' into 0.9.x

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

diff --git a/.gitignore b/.gitignore
index da6947bfdc3f27978ab534a07be6a96a4797a6ef..bf491ec3c2ce7e65de1bfdeb1f5ba0e2d7d70786 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 avatar/*
+background/*
 files/*
+file/*
+local/*
 _darcs/*
 logs/*
 config.php
@@ -16,3 +19,11 @@ dataobject.ini
 .buildpath
 .project
 .settings
+TODO.rym
+config-*.php
+good-config.php
+lac08.log
+php.log
+.DS_Store
+nbproject
+*.mo