aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-12-23 11:52:05 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-12-23 11:52:05 -0800
commit2aa70bd61a5c4a55dffa79fb6da9b8c8d6dd8b69 (patch)
treee9b8178d3b0fb6236601526bcde3f6628ef74940 /activeresource
parent885f59f6852cce670b48680fa0a1b6a4b0998291 (diff)
parent325669f0795a9148fd31f7f496a40dc8e114ef52 (diff)
downloadrails-2aa70bd61a5c4a55dffa79fb6da9b8c8d6dd8b69.tar.gz
rails-2aa70bd61a5c4a55dffa79fb6da9b8c8d6dd8b69.tar.bz2
rails-2aa70bd61a5c4a55dffa79fb6da9b8c8d6dd8b69.zip
Merge branch '3-2-sec' into 3-2-secmerge
* 3-2-sec: CVE-2012-5664 options hashes should only be extracted if there are extra parameters updating changelog updating the changelogs updating the changelog for the CVE Add release date of Rails 3.2.9 to documentation Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md activemodel/CHANGELOG.md activerecord/CHANGELOG.md activeresource/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md
Diffstat (limited to 'activeresource')
-rw-r--r--activeresource/CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md
index bdd50ab8b2..e77980f3b5 100644
--- a/activeresource/CHANGELOG.md
+++ b/activeresource/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Rails 3.2.11 ##
+
+## Rails 3.2.10 ##
+
## Rails 3.2.9 (Nov 12, 2012) ##
* No changes.