diff options
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activeresource/lib/active_resource/version.rb | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md index 1d084ec5d9..a4c97dc12c 100644 --- a/activeresource/CHANGELOG.md +++ b/activeresource/CHANGELOG.md @@ -1,14 +1,16 @@ -## unreleased ## +## Rails 3.2.14.rc1 (Jul 8, 2013) ## * Fixes an issue that ActiveResource models ignores ActiveResource::Base.include_root_in_json. Backported from the now separate repo rails/activeresouce. *Xinjiang Lu* + ## Rails 3.2.13 (Mar 18, 2013) ## * No changes. + ## Rails 3.2.12 (Feb 11, 2013) ## * No changes. diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb index 6c3ee00be6..6f0395bba1 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -2,8 +2,8 @@ module ActiveResource module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 13 - PRE = nil + TINY = 14 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end |