mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Conflicts: actionmailer/lib/action_mailer/mail_helper.rb railties/lib/rails/configuration.rb
Conflicts: actionmailer/lib/action_mailer/mail_helper.rb railties/lib/rails/configuration.rb