Zachary Scott 1ffd603712 Merge branch 'action-mailer-async-doc-fixes' of https://github.com/mfazekas/rails into mfazekas-action-mailer-async-doc-fixes ... Conflicts: actionmailer/lib/action_mailer/base.rb		2015-04-12 13:28:10 -07:00
..
action_mailer	Merge branch 'action-mailer-async-doc-fixes' of https://github.com/mfazekas/rails into mfazekas-action-mailer-async-doc-fixes	2015-04-12 13:28:10 -07:00
rails/generators/mailer	Merge pull request #18393 from y-yagi/fix_mailer	2015-02-18 19:05:07 -02:00
action_mailer.rb	Update copyright notices to 2015 [ci skip]	2014-12-31 08:34:14 +01:00