diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-22 20:24:09 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-22 20:24:09 -0300 |
commit | 2b3ce8627b6b4a401a2e869b22e51cc88d52c49b (patch) | |
tree | 7205ec41e28059371d2a9c874ce0ceab7f57498d /actionmailer | |
parent | d8353073d1d00ace843eb5e402ebc7fdb2d7c342 (diff) | |
parent | c69ccea6f291fd3dd18d20597abf268bcc1233cf (diff) | |
download | rails-2b3ce8627b6b4a401a2e869b22e51cc88d52c49b.tar.gz rails-2b3ce8627b6b4a401a2e869b22e51cc88d52c49b.tar.bz2 rails-2b3ce8627b6b4a401a2e869b22e51cc88d52c49b.zip |
Merge branch '3-2-14' into 3-2-stable
Diffstat (limited to 'actionmailer')
-rw-r--r-- | actionmailer/CHANGELOG.md | 2 | ||||
-rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index ce37730c44..37241dc4ad 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,4 +1,4 @@ -## unreleased ## +## Rails 3.2.14 (Jul 22, 2013) ## * No changes. diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index 00f0516066..6f596710d4 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -2,7 +2,7 @@ module ActionMailer module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 13 + TINY = 14 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |