diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-07-03 13:01:39 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-07-03 13:01:39 +0100 |
| commit | 2fe263bb328c20539f2970057f31e567ec4ab7c8 (patch) | |
| tree | 63e85164fb09aca6beb78e1a5c52424fa49ed098 /actionpack/lib/action_pack/version.rb | |
| parent | bf5ac9965f12840d469ef2a4a16e8205dbbe5253 (diff) | |
| parent | a4bdc00fec623f72592e663e6d7830eea0bc6ea4 (diff) | |
| download | rails-2fe263bb328c20539f2970057f31e567ec4ab7c8.tar.gz rails-2fe263bb328c20539f2970057f31e567ec4ab7c8.tar.bz2 rails-2fe263bb328c20539f2970057f31e567ec4ab7c8.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller.rb
actionpack/lib/action_controller/base/base.rb
actionpack/lib/action_view/template/path.rb
activesupport/lib/active_support/json/encoders/hash.rb
Diffstat (limited to 'actionpack/lib/action_pack/version.rb')
| -rw-r--r-- | actionpack/lib/action_pack/version.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb index e0aa2a5f2f..ed0cdf38ee 100644 --- a/actionpack/lib/action_pack/version.rb +++ b/actionpack/lib/action_pack/version.rb @@ -1,8 +1,8 @@ module ActionPack #:nodoc: module VERSION #:nodoc: - MAJOR = 2 - MINOR = 3 - TINY = 2 + MAJOR = 3 + MINOR = 0 + TINY = "pre" STRING = [MAJOR, MINOR, TINY].join('.') end |