diff options
Diffstat (limited to 'actionmailer/CHANGELOG')
| -rw-r--r-- | actionmailer/CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 1fdc821a7c..f22880299a 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Resolve conflict among mailer actions with the same name. #5520 [ssinghi@kreeti.com] + * ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, Marcel Molina Jr.] * Replace alias method chaining with Module#alias_method_chain. [Marcel Molina Jr.] |