Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x

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

diff --git a/.gitignore b/.gitignore
index 3418d8ee54d1178448469dd417721c9831c1ea2d..f4c2bba5f7af504503ab4a03fa2d3faf50d99b2e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 avatar/*
+background/*
 files/*
 file/*
 _darcs/*
@@ -22,3 +23,4 @@ config-*.php
 good-config.php
 lac08.log
 php.log
+config.php.*