diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-22 10:31:47 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-22 10:31:47 -0800 |
| commit | e68bc3f14ea93eabdd4274e66071b65debb5a0a8 (patch) | |
| tree | 223c11f38dac1217d8e7e3cd427fdf6018975a9d /.gitignore | |
| parent | 3cb46b40a0df1a1f4912625cc2be40b3d630f1f3 (diff) | |
| parent | e1935e3c0c35f8f1196239e2b1213c4436049fa5 (diff) | |
| download | rails-e68bc3f14ea93eabdd4274e66071b65debb5a0a8.tar.gz rails-e68bc3f14ea93eabdd4274e66071b65debb5a0a8.tar.bz2 rails-e68bc3f14ea93eabdd4274e66071b65debb5a0a8.zip | |
Merge commit 'origin/master' into mail
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 3b922f29f7..70b7c0057a 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ railties/guides/output *.rbc *.swp *.swo +*.tmproj bin vendor/gems/ railties/tmp |