diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-27 07:56:19 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-27 07:56:19 -0700 |
| commit | f1fda6c0503e32edfc99b297f4bf2cb07e629d9e (patch) | |
| tree | 4190903afb80c20b7e98c95e6ea8d57ced0695d9 /.gitignore | |
| parent | 209486d3be877d85b3e241797e6042283d0f66d6 (diff) | |
| parent | fd53fba114283935a304ed2e05111da256ae798f (diff) | |
Merge branch '0.8.x' into 0.9.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 |