diff options
| author | Zach <zach@plantard.controlezvous.ca> | 2009-01-11 04:27:13 +0000 |
|---|---|---|
| committer | Zach <zach@plantard.controlezvous.ca> | 2009-01-11 04:27:13 +0000 |
| commit | 2d6d2ee8e2c8b85901ac26535f32d9988222f7ba (patch) | |
| tree | 400f9fac5658b35ad71a212d41c4ffaeb128ef3d | |
| parent | d96de79888d59d88ff96d7aacb75a3be353e67a3 (diff) | |
| parent | b98d8b250073d0da0b724486a3ff083870331448 (diff) | |
Merge branch 'master' of /var/www/trunk
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index c75c07de6..fb5d478fe 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ files/* _darcs/* config.php .htaccess +*.tmproj |