aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/CHANGELOG
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-06-29 20:14:33 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-06-29 20:14:33 +0000
commitf3aa7c1e64b2f872215f860cecbe7feca3e793d7 (patch)
treedd0e14ac1300578d9a72f2fc6af28b06003c17c7 /actionmailer/CHANGELOG
parent5fe64dd1a62eafc27b20b82b4b6c1139887046e3 (diff)
downloadrails-f3aa7c1e64b2f872215f860cecbe7feca3e793d7.tar.gz
rails-f3aa7c1e64b2f872215f860cecbe7feca3e793d7.tar.bz2
rails-f3aa7c1e64b2f872215f860cecbe7feca3e793d7.zip
r4730@asus: jeremy | 2006-06-29 13:13:38 -0700
Avoid naming collision among compiled view methods. Back out AM workaround. References #5520. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4512 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/CHANGELOG')
-rw-r--r--actionmailer/CHANGELOG2
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.]