From 6b1aa4ce014b2c0801faf77f8eafaa5ac9107581 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 5 Aug 2017 11:01:42 -0400
Subject: [PATCH] Update history to reflect merge of #6273 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index faaea140995..93afaf6897b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Enforce Style/FrozenStringLiteralComment (#6265)
   * Update theme-template README to note &#39;assets&#39; directory (#6257)
   * Memoize the return value of Document#url (#6266)
+  * delegate `StaticFile#to_json` to `StaticFile#to_liquid` (#6273)
 
 ### Documentation