aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-11-07 09:31:49 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-11-07 09:31:49 +0000
commit8dda7c5449f0c8f8f8569d6ca6c1aa3d906518a1 (patch)
tree79d533b4e80664d82fcb1df3c004a17a0ad2fb68 /actionpack/CHANGELOG
parent6c434e8b8e420c76f86ba6605e98426fddca5031 (diff)
downloadrails-8dda7c5449f0c8f8f8569d6ca6c1aa3d906518a1.tar.gz
rails-8dda7c5449f0c8f8f8569d6ca6c1aa3d906518a1.tar.bz2
rails-8dda7c5449f0c8f8f8569d6ca6c1aa3d906518a1.zip
Fix conflict with assert_tag and Glue gem (closes #2255) [david.felstead@gmail.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2905 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r--actionpack/CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 3905686049..f884c8d404 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix conflict with assert_tag and Glue gem #2255 [david.felstead@gmail.com]
+
* Add documentation to assert_tag indicating that it only works with well-formed XHTML #1937, #2570 [Jamis Buck]
* Added action_pack.rb stub so that ActionPack::Version loads properly [Sam Stephenson]