diff options
author | José Valim <jose.valim@gmail.com> | 2009-11-23 22:04:18 -0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-11-23 22:04:18 -0200 |
commit | 4ff66b6b85d1351e447f18c027f1dba6bcf23a7b (patch) | |
tree | a46d6c65c5c67964bc8658bf991157f0f8056f55 /.gitignore | |
parent | 01ae99c681d31803f3a29f8305c9a041aa456660 (diff) | |
parent | 934bb012ba3f1da5cd181ae5c2d84f697a3c58a1 (diff) | |
download | rails-4ff66b6b85d1351e447f18c027f1dba6bcf23a7b.tar.gz rails-4ff66b6b85d1351e447f18c027f1dba6bcf23a7b.tar.bz2 rails-4ff66b6b85d1351e447f18c027f1dba6bcf23a7b.zip |
Merge branch 'master' of git://github.com/rails/rails
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 |