rails--rails

mirror of https://github.com/rails/rails.git

Author	SHA1	Message	Date
David Heinemeier Hansson	21187c0fb4	Apply the rest of Chads patch git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6180 5ecf4fe2-1ee6-0310-87b1-e25e094e27de	2007-02-21 00:29:44 +00:00
Jeremy Kemper	1fd9a46d71	Resolve conflict among mailer actions with the same name. Closes #5520 . git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4509 5ecf4fe2-1ee6-0310-87b1-e25e094e27de	2006-06-29 01:54:16 +00:00