diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-25 18:01:46 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-25 18:01:46 -0400 |
| commit | d0baab6978f1959382d568d26cc9f8f552a7b764 (patch) | |
| tree | 32bbe1148e86bb7846ae1f0e581c0f3c0f68956f /.gitignore | |
| parent | 077955cb1d45f866d65aebdc42f5e3e71dc74045 (diff) | |
| parent | a2117961be463d566c8f3c6ccd9b8e840f171804 (diff) | |
Merge branch '0.8.x' into testing
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 |