diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-24 17:49:31 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-24 17:49:31 -0400 |
commit | ab2f6fb8601fa0463c0fedc872a830b9d5283ba4 (patch) | |
tree | 2cc8d4796414042968aff8b428e8d3bd3de21a98 /.gitignore | |
parent | add42759c9ae1e8d765fa2098bd12ff8ba4d4eea (diff) | |
parent | eceffc4c01acd8e07cdb3b0a8591a7e65e5317be (diff) |
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
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 |