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

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

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