1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Merge branch 'master' of github.com:rails/rails

This commit is contained in:
Xavier Noria 2011-08-04 16:42:14 -07:00
commit 04f88d1630

3
.gitignore vendored
View file

@ -1,4 +1,3 @@
*.gem
pkg
.bundle
Gemfile.lock
@ -22,4 +21,4 @@ railties/doc
railties/guides/output
railties/tmp
.rvmrc
RDOC_MAIN.rdoc
RDOC_MAIN.rdoc