diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-02-22 17:03:41 -0800 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-02-22 17:03:41 -0800 |
| commit | 8e0508dad3bb888b0c01834614b1aa7e16cfe583 (patch) | |
| tree | 04f2734597377942fbbfc5b4f133e951ccc645a5 /.gitignore | |
| parent | cdab8d55a96b61ce6cfbec697d95e3223751fd3f (diff) | |
| parent | da532bae9131b6dec8f5c0d67ce77c4ad1736f7d (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f2e96d3eb..83a53dfa3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,10 @@ avatar/* files/* _darcs/* +logs/* config.php .htaccess +httpd.conf *.tmproj dataobject.ini *~ @@ -10,3 +12,4 @@ dataobject.ini *.orig *.rej .#* +*.swp |