From f46dffcc8e9285c4a7a76d84042e406079bb2bf2 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 5 Apr 2017 15:36:31 -0400
Subject: [PATCH] Update history to reflect merge of #6007 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 339911e1..90d1c4b2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -56,6 +56,7 @@
   * Use Rubocop v0.47.1 till we're ready for v0.48 (#5989)
   * Test against Ruby 2.4.0 (#5687)
   * rubocop: lib/jekyll/renderer.rb complexity fixes (#5052)
+  * Use yajl-ruby 1.2.2 (now with 2.4 support) (#6007)
 
 ### Site Enhancements