summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-08-26 21:56:59 -0400
committerCraig Andrews <candrews@integralblue.com>2009-08-26 21:56:59 -0400
commit3e362233ee2f7acd676c0ee86025d7511f265b7e (patch)
treef691c476d17d31517e3367c1bc3d9608c4d7eed8 /.gitignore
parent504c42aa7d4ff5cccd722bceb3231a5a8f46a27b (diff)
parentb7beac36c2dbebfa27982b2fc6c82cf2ebbaae8d (diff)
Merge commit 'laconica/0.8.x' into 0.9.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