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 2942a9c072..157c975ef0 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* 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]
+
* Allow mailer actions named send by using __send__ internally. #6467 [iGEL]
* Add assert_emails and assert_no_emails to test the number of emails delivered. #6479 [Jonathan Viney]