From 5ec2c7dc29b36d85b2658465b8a979deb0529d7e Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 28 May 2009 17:12:28 -0500
Subject: Ruby 1.9: ERB template encoding using a magic comment at the top of
 the file

---
 actionpack/CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'actionpack/CHANGELOG')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index e3ad19558e..e758983d7a 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,8 @@
 *Edge*
 
+* Ruby 1.9: ERB template encoding using a magic comment at the top of the file.  [Jeremy Kemper]
+    <%# encoding: utf-8 %>
+
 * Change integration test helpers to accept Rack environment instead of just HTTP Headers [Pratik Naik]
 
   Before :  get '/path', {}, 'Accept' => 'text/javascript'
-- 
cgit v1.2.3