José Valim and Mikel Lindsaar 4e96442c4e Merge branch 'master' of git://github.com/rails/rails ... Conflicts: actionmailer/lib/action_mailer/mail_helper.rb railties/lib/rails/configuration.rb		2010-01-25 09:50:01 +11:00
..
generators	Merge branch 'master' of git://github.com/rails/rails	2010-01-25 09:50:01 +11:00
rails	Revamp of Rails documentation task	2010-01-24 13:16:38 -08:00
rails.rb	Move configuration to subfolders.	2010-01-23 22:30:17 +01:00