Rafael Mendonça França c78da4d5c4 Merge branch 'master' into loofah ... Conflicts: actionpack/CHANGELOG.md		2014-08-17 22:38:22 -03:00
..
action_mailer	Merge branch 'master' into loofah	2014-08-17 22:38:22 -03:00
rails/generators/mailer	Revert "Document Rails::Generators::MailerGenerator"	2013-05-19 21:05:35 +05:30
action_mailer.rb	[ActionMailer] Rename ActionMailer::DelayedDeliveryJob to ActionMailer::DeliveryJob	2014-08-17 23:10:08 +00:00