diff options
author | sarven <csarven@plantard.controlezvous.ca> | 2009-01-16 17:03:37 +0000 |
---|---|---|
committer | sarven <csarven@plantard.controlezvous.ca> | 2009-01-16 17:03:37 +0000 |
commit | dce8cf684580ff8008e34fa5000de7846afc5a86 (patch) | |
tree | 1d3d9d8cc2d8918c91a86f65637fb800b127f302 /.gitignore | |
parent | 877327a18e15d768df3bda658ce9dded116399fa (diff) | |
parent | 41d958f11feba8be0c9375a4c424e51fd83fa20e (diff) |
Merge branch 'uiredesign' of ../evan into uiredesign
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 8c94886e7..f5a3e0212 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ config.php dataobject.ini *~ *.bak +*.orig +*.rej |