aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authorMiguel <miguelfernandezfernandez@gmail.com>2013-01-03 11:54:21 +0100
committerMiguel <miguelfernandezfernandez@gmail.com>2013-01-03 11:54:21 +0100
commit2e4df2a2893ac95e86952df5ff82e500c19545d9 (patch)
tree3c19996c00d538793aa24a7f5c52ebe58df3cabb /actionmailer/lib
parent4d4e6e2f2be4f0c3ae2edb9ce56de0840a2abe60 (diff)
parent8ba3df046f977dddd4bc46248db2a1355bc0ed1e (diff)
downloadrails-2e4df2a2893ac95e86952df5ff82e500c19545d9.tar.gz
rails-2e4df2a2893ac95e86952df5ff82e500c19545d9.tar.bz2
rails-2e4df2a2893ac95e86952df5ff82e500c19545d9.zip
Merge tag 'v3.2.10' into 3-2-stable
Latest released tag was not fully merged into the stable branch (missed version bumping)
Diffstat (limited to 'actionmailer/lib')
-rw-r--r--actionmailer/lib/action_mailer/version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index 24a5027f51..87ebf63169 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 = 9
+ TINY = 10
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')