summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJeffery To <jeffery.to@gmail.com>2009-06-24 01:08:44 +0800
committerJeffery To <jeffery.to@gmail.com>2009-06-24 01:08:44 +0800
commit3e60160f07f32d109b545db6b73be344b9180de8 (patch)
tree978f66cfb5f25eda6a01e8d3beaf9921d20e28e1 /.gitignore
parent43680ed0c2cf83448d755fa1edff42711d06a82c (diff)
parenteb40fbc17ad1efb0a4c51ee00b1e9408d2af382f (diff)
Merge branch '0.8.x' into group-rss-empty
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 3418d8ee5..f4c2bba5f 100644
--- 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.*