diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-02-04 13:14:44 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-02-04 13:14:44 +0000 |
| commit | 8260f0b40f8954f1822a0f856f7c0706afbba0bd (patch) | |
| tree | 1ec6fe65274eeb87c2030ba2daa3e230a375e846 /activemodel/lib | |
| parent | 6241d4e5535190b817e546130cfe179b641da1ba (diff) | |
| parent | 6d6e6105c074eb9f266619e77a0873635af94124 (diff) | |
| download | rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.tar.gz rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.tar.bz2 rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
railties/guides/source/3_0_release_notes.textile
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb index 0c233b7b4f..f569447bc8 100644 --- a/activemodel/lib/active_model/version.rb +++ b/activemodel/lib/active_model/version.rb @@ -2,7 +2,7 @@ module ActiveModel module VERSION #:nodoc: MAJOR = 3 MINOR = 0 - TINY = "pre" + TINY = "0.beta" STRING = [MAJOR, MINOR, TINY].join('.') end |