diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-01-20 23:13:02 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-01-20 23:13:02 -0500 |
| commit | 4b9df58c90e25ea79aeec64c6e96f828fe06d7df (patch) | |
| tree | ac237014d015535d07babba42d40d86608de0ec5 /.gitignore | |
| parent | bd056218f9a595184ac7bcac0c1dc6a8981d7af2 (diff) | |
| parent | 65bfda33b8464caf14ce268c9bea2e7eceb27fe5 (diff) | |
Merge branch 'master' into groups
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 0c0fde801..f5a3e0212 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,7 @@ config.php .htaccess *.tmproj dataobject.ini +*~ +*.bak +*.orig +*.rej |