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

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

diff --git a/.gitignore b/.gitignore
index fd12b8fa6e736b678034475db2fcef451b3fc6f9..00383151a6401dfbfde841ba02bceb70845f04fd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 avatar/*
-background/*
 files/*
 file/*
 local/*