aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2012-01-18 13:41:11 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2012-01-18 13:41:11 -0500
commit939a84a40a188786dcc6eff18304b6b50d7280a2 (patch)
tree488c74f2f3a7fa1b320c7672de00f594c9b9c567 /actionmailer
parent0960eb97d97bbfc018116ccf204bf8882743c109 (diff)
downloadrails-939a84a40a188786dcc6eff18304b6b50d7280a2.tar.gz
rails-939a84a40a188786dcc6eff18304b6b50d7280a2.tar.bz2
rails-939a84a40a188786dcc6eff18304b6b50d7280a2.zip
Update AM CHANGELOG
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/CHANGELOG.md9
1 files changed, 8 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 57af4ee6a4..cb6604f31c 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,3 +1,10 @@
+## Rails 3.2.0 (unreleased) ##
+
+* Upgrade mail version to 2.4.0 *ML*
+
+* Remove Old ActionMailer API *Josh Kalderimis*
+
+
## Rails 3.1.0 (August 30, 2011) ##
* No changes
@@ -8,7 +15,7 @@
* remove AM delegating register_observer and register_interceptor to Mail *Josh Kalderimis*
-* Rails 3.0.6 (April 5, 2011)
+## Rails 3.0.6 (April 5, 2011) ##
* Don't allow i18n to change the minor version, version now set to ~> 0.5.0 *Santiago Pastorino*