aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-01-18 10:54:01 -0800
committerVijay Dev <vijaydev.cse@gmail.com>2012-01-18 10:54:01 -0800
commitf2af2acac73b675600cf0644a9a0144e50e44c09 (patch)
tree903b594d46040f5bb4e28e07d61535b4434795ce
parent619731f2bb757965d20572a5f3f697045b0f5572 (diff)
parent939a84a40a188786dcc6eff18304b6b50d7280a2 (diff)
downloadrails-f2af2acac73b675600cf0644a9a0144e50e44c09.tar.gz
rails-f2af2acac73b675600cf0644a9a0144e50e44c09.tar.bz2
rails-f2af2acac73b675600cf0644a9a0144e50e44c09.zip
Merge pull request #4525 from guilleiguaran/am-changelog-3-2-stable
Update AM CHANGELOG
-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*