From 867063134fb903046d9eac27755a67204a26e148 Mon Sep 17 00:00:00 2001
From: Rick Olson <technoweenie@gmail.com>
Date: Fri, 7 Mar 2008 01:23:12 +0000
Subject: Better error message for type conflicts when parsing params.  Closes
 #7962 [spicycode, matt]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8986 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack/CHANGELOG')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 4f2891577e..7583eb9de2 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Better error message for type conflicts when parsing params.  Closes #7962 [spicycode, matt]
+
 * Remove unused ActionController::Base.template_class. Closes #10787 [Pratik]
 
 * Moved template handlers related code from ActionView::Base to ActionView::Template. [Pratik]
-- 
cgit v1.2.3