diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-02-26 13:22:51 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-02-26 13:22:51 -0800 |
| commit | 34a61b40f47a52d1fdcf7cd907f3ac53b96b038e (patch) | |
| tree | 14ddeb18d9e020760d8c2308a12d858b6eab4a17 /.gitignore | |
| parent | 478192fa3b2375a0ff0a5ff03956381e5da7a6ac (diff) | |
| parent | 8c3fe83c645265a11a3fca80cac2ac48ea72cdab (diff) | |
Merge branch '0.7.x' into 0.8.x
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f5a3e0212..83a53dfa3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,15 @@ avatar/* files/* _darcs/* +logs/* config.php .htaccess +httpd.conf *.tmproj dataobject.ini *~ *.bak *.orig *.rej +.#* +*.swp |