aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/CHANGELOG
diff options
context:
space:
mode:
Diffstat (limited to 'actionmailer/CHANGELOG')
-rw-r--r--actionmailer/CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
index 6a2ef88e99..f2a2e0bee1 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Only load ActionController::UrlWriter if ActionController is present [Rick Olson]
+
* Make sure parsed emails recognized attachments nested inside multipart parts. #6714 [Jamis Buck]
* Rename server_settings to smtp settings, and add sendmail_settings to allow you to override the arguments to and location of the sendmail executable. [Koz]