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

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

diff --git a/.gitignore b/.gitignore
index f724ded80816fe670c51be813850d81068f4656c..00383151a6401dfbfde841ba02bceb70845f04fd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 avatar/*
-background/*
 files/*
 file/*
 local/*
@@ -33,3 +32,5 @@ nbproject
 htaccess-sample
 installer.txt
 extlib/DB.php
+.gitmodules
+*_plugin/*