From d0b5f640f2f4ad4f6c42d33300129601210257de Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 10 Dec 2007 09:12:50 +0000
Subject: Fix javascript_tag method name collision. Closes #10337.

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

(limited to 'actionpack/CHANGELOG')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 483c255085..a5bc36bb22 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,6 +1,6 @@
 *SVN*
 
-* Ensure asset cache directories are automatically created.  #10337 [Josh Peek]
+* Ensure asset cache directories are automatically created.  #10337 [Josh Peek, Chu Yeow]
 
 * render :xml and :json preserve custom content types.  #10388 [jmettraux, Chu Yeow]
 
-- 
cgit v1.2.3