aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-22 20:24:09 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-22 20:24:09 -0300
commit2b3ce8627b6b4a401a2e869b22e51cc88d52c49b (patch)
tree7205ec41e28059371d2a9c874ce0ceab7f57498d /activeresource/CHANGELOG.md
parentd8353073d1d00ace843eb5e402ebc7fdb2d7c342 (diff)
parentc69ccea6f291fd3dd18d20597abf268bcc1233cf (diff)
downloadrails-2b3ce8627b6b4a401a2e869b22e51cc88d52c49b.tar.gz
rails-2b3ce8627b6b4a401a2e869b22e51cc88d52c49b.tar.bz2
rails-2b3ce8627b6b4a401a2e869b22e51cc88d52c49b.zip
Merge branch '3-2-14' into 3-2-stable
Diffstat (limited to 'activeresource/CHANGELOG.md')
-rw-r--r--activeresource/CHANGELOG.md4
1 files changed, 3 insertions, 1 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.