aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2010-06-08 14:46:26 -0400
committerDavid Heinemeier Hansson <david@loudthinking.com>2010-06-08 14:47:02 -0400
commit32d4330b8185caa05af6ae69b0769b34b5e159eb (patch)
treecfda1c0445d91526a7b6eadbd83a4d7cbeff3d64 /actionmailer
parent585f8f27b190637fd0bad67d7d611eed5ae262e7 (diff)
downloadrails-32d4330b8185caa05af6ae69b0769b34b5e159eb.tar.gz
rails-32d4330b8185caa05af6ae69b0769b34b5e159eb.tar.bz2
rails-32d4330b8185caa05af6ae69b0769b34b5e159eb.zip
Get ready for beta 4
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/CHANGELOG2
-rw-r--r--actionmailer/lib/action_mailer/version.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
index 7a17ff1df9..6e2c441e53 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -1,4 +1,4 @@
-*Rails 3.0.0 [beta 4/release candidate] (unreleased)*
+*Rails 3.0.0 [beta 4] (June 8th, 2010)*
* Changed encoding behaviour of mail, so updated tests in actionmailer and bumped mail version to 2.2.1 [ML]
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index e66172c8d3..8c19082f61 100644
--- a/actionmailer/lib/action_mailer/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb
@@ -3,7 +3,7 @@ module ActionMailer
MAJOR = 3
MINOR = 0
TINY = 0
- BUILD = "beta3"
+ BUILD = "beta4"
STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
end