From b50056e8df2da8e23b5290eab2703f547f35478f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 31 Oct 2015 03:37:45 +0800
Subject: [PATCH] Update history to reflect merge of #4077

[ci skip]
---
 History.markdown | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/History.markdown b/History.markdown
index 50186047..68210588 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,6 +1,11 @@
 ## HEAD
 
+### Bug Fixes
+
+  * `Convertible#render_liquid` should use `render!` to cause failure on bad Liquid (#4077)
+
 ### Development Fixes
+
   * Fix test warnings when doing rake {test,spec} or script/test (#4078)
 
 ## 3.0.0 / 2015-10-26