diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-09 21:51:24 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-09 21:51:24 -0700 |
| commit | 4df1ea49ec75ec9dd64bc8f58c01e64ea18bedc7 (patch) | |
| tree | 91535b33cd2b62b0726821e4d217d587da7cd61b /.gitignore | |
| parent | b3628b78448266fda2368f1317e70d1cca45ac17 (diff) | |
| parent | ed627bb4bd6424325478412055d295b185f9f662 (diff) | |
Merge branch '0.8.x' into userdesign
Conflicts:
actions/designsettings.php
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index da6947bfd..3418d8ee5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ avatar/* files/* +file/* _darcs/* logs/* config.php @@ -16,3 +17,8 @@ dataobject.ini .buildpath .project .settings +TODO.rym +config-*.php +good-config.php +lac08.log +php.log |