Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/.gitignore b/.gitignore
index 41084c45cd1cf2e0a198bef83e7fffcc2cf1d5ae..00383151a6401dfbfde841ba02bceb70845f04fd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 avatar/*
-background/*
 files/*
 file/*
 local/*
@@ -29,4 +28,9 @@ php.log
 .DS_Store
 nbproject
 *.mo
-
+*log*
+htaccess-sample
+installer.txt
+extlib/DB.php
+.gitmodules
+*_plugin/*