summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-17 23:56:42 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-17 23:56:42 -0700
commit79e732bd03c020eab36ceb13c5a712e76df3ac75 (patch)
tree48cd2d1b916a8f53beefa6c856677eb5278921f1 /.gitignore
parent19d39b20294bad8dc14df26e76756c558a5083cf (diff)
parentc14c9e1a086f0de29ef5c37fbeb34f6082b1c5ef (diff)
Merge branch '0.8.x' into twitterpriv
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 3418d8ee5..8a7f5c65c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
avatar/*
+background/*
files/*
file/*
_darcs/*