diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-02 10:25:18 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-02 10:25:18 +0200 |
| commit | 1c265da1db934ffab0a5151dc7beeed3ef1bbabb (patch) | |
| tree | e3e2af724e0fe70b9bceb09a26a179fadf76b992 /actionmailer/lib | |
| parent | 4739f0ff5d5c013eb33aed7f371a3a91d3fca292 (diff) | |
| parent | 8bb510f6c1e235f5fb1cf9e79af759a429a497b0 (diff) | |
| download | rails-1c265da1db934ffab0a5151dc7beeed3ef1bbabb.tar.gz rails-1c265da1db934ffab0a5151dc7beeed3ef1bbabb.tar.bz2 rails-1c265da1db934ffab0a5151dc7beeed3ef1bbabb.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index 08ff0d2ffb..0f2b58552b 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -1,8 +1,8 @@ module ActionMailer module VERSION #:nodoc: - MAJOR = 2 - MINOR = 3 - TINY = 2 + MAJOR = 3 + MINOR = 0 + TINY = "pre" STRING = [MAJOR, MINOR, TINY].join('.') end |