Vijay Dev 70ff31d69f Merge branch 'master' of github.com:rails/docrails ... Conflicts: guides/source/4_1_release_notes.md		2014-03-07 20:58:11 +05:30
..
action_mailer	Merge branch 'master' of github.com:rails/docrails	2014-03-07 20:58:11 +05:30
rails/generators/mailer	Revert "Document Rails::Generators::MailerGenerator"	2013-05-19 21:05:35 +05:30
action_mailer.rb	update copyright notices to 2014. [ci skip]	2014-01-01 23:59:49 +05:30