This project is archived and is in readonly mode.
Changeset [671538cd6ea0bd4c463e7bf7d238a55924a8af53] by Jeremy Kemper
Revision 671538cd6ea0bd4c463e7bf7d238a55924a8af53,
committed by Jeremy Kemper
· November 23rd, 2009 @ 11:29 PM
Merge commit 'mikel/master' into mail
Conflicts:
actionmailer/lib/action_mailer.rb
http://github.com/rails/rails/commit/671538cd6ea0bd4c463e7bf7d238a5...
7 changed files
-
R
actionmailer/lib/action_mailer/utils.rb -
M
actionmailer/CHANGELOG -
M
actionmailer/actionmailer.gemspec -
M
actionmailer/lib/action_mailer.rb -
M
actionmailer/lib/action_mailer/base.rb -
M
actionmailer/test/mail_service_test.rb -
M
actionmailer/test/quoting_test.rb