summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-08-26 14:35:25 +0000
committerZach Copley <zach@controlyourself.ca>2009-08-26 14:35:25 +0000
commit937a05fb5d043ee6c2ce0e2d668c93f8b6717bc9 (patch)
tree4d32a6f2fa4ff1722831cf97b4a833d71ca2506e /.gitignore
parentcbdf8e51aa2826e11cc17c34bcbf568ca37e26ce (diff)
parent2f1e719cbee6734053c70845665204ee1899c88e (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5394f5eac..1cde3a625 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ avatar/*
background/*
files/*
file/*
+local/*
_darcs/*
logs/*
config.php