From deff194cbf1de675b3034a259a5f40f862da3ec1 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 26 Sep 2018 15:20:53 -0400
Subject: [PATCH] Update history to reflect merge of #7278 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7cd46acd..4dcabd27 100644
--- a/History.markdown
+++ b/History.markdown
@@ -114,6 +114,7 @@
   * Small benchmark refactoring (#7211)
   * Add cucumber feature to test include_relative tag (#7213)
   * Bump Rubocop to v0.59.0 (#7237)
+  * update yajl-ruby (#7278)
 
 ### Bug Fixes