Permalink
Browse files

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

  • Loading branch information...
2 parents 9e18380 + c7af6cf commit 04f88d163094a8b5fa56ba8178cec56aa3ea6b79 @fxn fxn committed Aug 4, 2011
Showing with 1 addition and 2 deletions.
  1. +1 −2 .gitignore
View
@@ -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

0 comments on commit 04f88d1

Please sign in to comment.