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