update changes

Conflicts: CHANGES
sinatra · Oct 15, 2011 · e913e53 · e913e53
1 parent 2b8dc06
commit e913e53
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,10 @@
+= 1.2.8 / Not Yet Released
+
+Backported from 1.3.2:
+
+* Fix bug where rendering a second template in the same request after the
+  first one raised an exception skipped the default layout (Nathan Baum)
+
 = 1.2.7 (backports release) / 2011-09-30
 
 Custom changes: