diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-22 20:24:09 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-22 20:24:09 -0300 |
| commit | 2b3ce8627b6b4a401a2e869b22e51cc88d52c49b (patch) | |
| tree | 7205ec41e28059371d2a9c874ce0ceab7f57498d /activeresource | |
| parent | d8353073d1d00ace843eb5e402ebc7fdb2d7c342 (diff) | |
| parent | c69ccea6f291fd3dd18d20597abf268bcc1233cf (diff) | |
| download | rails-2b3ce8627b6b4a401a2e869b22e51cc88d52c49b.tar.gz rails-2b3ce8627b6b4a401a2e869b22e51cc88d52c49b.tar.bz2 rails-2b3ce8627b6b4a401a2e869b22e51cc88d52c49b.zip | |
Merge branch '3-2-14' into 3-2-stable
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activeresource/lib/active_resource/version.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md index 1d084ec5d9..dd618e4f27 100644 --- a/activeresource/CHANGELOG.md +++ b/activeresource/CHANGELOG.md @@ -1,14 +1,16 @@ -## unreleased ## +## Rails 3.2.14 (Jul 22, 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..b1dd63a363 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -2,7 +2,7 @@ module ActiveResource module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 13 + TINY = 14 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |