diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-08 21:23:29 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-08 21:23:29 +0200 |
| commit | 751f79a03351f1f0d21436b2b947352b97ded093 (patch) | |
| tree | 9dd053597389241398c9173ab7f565697bef055f /activeresource | |
| parent | e7e6ee3e7b075f5447697a6038cb46d65f9b137a (diff) | |
| parent | ab2877cbe89e266ee986fc12e603abd93ac017ad (diff) | |
| download | rails-751f79a03351f1f0d21436b2b947352b97ded093.tar.gz rails-751f79a03351f1f0d21436b2b947352b97ded093.tar.bz2 rails-751f79a03351f1f0d21436b2b947352b97ded093.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/CHANGELOG | 2 | ||||
| -rw-r--r-- | activeresource/lib/active_resource/version.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG index bd97b2d549..2b2092b9fe 100644 --- a/activeresource/CHANGELOG +++ b/activeresource/CHANGELOG @@ -1,4 +1,4 @@ -*Rails 3.0.0 [beta 4/release candidate] (unreleased)* +*Rails 3.0.0 [beta 4] (June 8th, 2010)* * JSON: set Base.include_root_in_json = true to include a root value in the JSON: {"post": {"title": ...}}. Mirrors the Active Record option. [Santiago Pastorino] diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb index 6b9b8d3a9d..198e77a3d1 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -3,7 +3,7 @@ module ActiveResource MAJOR = 3 MINOR = 0 TINY = 0 - BUILD = "beta3" + BUILD = "beta4" STRING = [MAJOR, MINOR, TINY, BUILD].join('.') end |