aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource
diff options
context:
space:
mode:
Diffstat (limited to 'activeresource')
-rw-r--r--activeresource/CHANGELOG.md7
-rw-r--r--activeresource/lib/active_resource/version.rb2
2 files changed, 7 insertions, 2 deletions
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md
index a4c97dc12c..7a07c70a49 100644
--- a/activeresource/CHANGELOG.md
+++ b/activeresource/CHANGELOG.md
@@ -1,4 +1,9 @@
-## Rails 3.2.14.rc1 (Jul 8, 2013) ##
+## Rails 3.2.14.rc2 (Jun 16, 2013) ##
+
+* No changes.
+
+
+## Rails 3.2.14.rc1 (Jul 12, 2013) ##
* Fixes an issue that ActiveResource models ignores ActiveResource::Base.include_root_in_json.
Backported from the now separate repo rails/activeresouce.
diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb
index 6f0395bba1..0f7bf6034a 100644
--- a/activeresource/lib/active_resource/version.rb
+++ b/activeresource/lib/active_resource/version.rb
@@ -3,7 +3,7 @@ module ActiveResource
MAJOR = 3
MINOR = 2
TINY = 14
- PRE = "rc1"
+ PRE = "rc2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end