diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-08-04 16:42:14 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-08-04 16:42:14 -0700 |
| commit | 04f88d163094a8b5fa56ba8178cec56aa3ea6b79 (patch) | |
| tree | 1519716fa4ff72a0b91e4459bcd3986922940f20 /.gitignore | |
| parent | 9e18380a323c7087b2079ec479d26ce899268b72 (diff) | |
| parent | c7af6cf58e34926b3f8d39867482c974c30fd9cb (diff) | |
| download | rails-04f88d163094a8b5fa56ba8178cec56aa3ea6b79.tar.gz rails-04f88d163094a8b5fa56ba8178cec56aa3ea6b79.tar.bz2 rails-04f88d163094a8b5fa56ba8178cec56aa3ea6b79.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index be764143aa..2d3c39d885 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -*.gem pkg .bundle Gemfile.lock @@ -22,4 +21,4 @@ railties/doc railties/guides/output railties/tmp .rvmrc -RDOC_MAIN.rdoc
\ No newline at end of file +RDOC_MAIN.rdoc |