aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
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 ceee5e72d1..f16d90af69 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Allow layouts with extension of .html.erb. Closes #8032 [Josh Knowles]
+
* Change default respond_to templates for xml and rjs formats. [Rick]
* Default xml template goes from #{action_name}.rxml => #{action_name}.xml.builder.