From cce53abe3d64cfc4057fcfd75f3f16a3e829d886 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sun, 9 Apr 2017 07:24:46 -0400
Subject: [PATCH] Update history to reflect merge of #5997 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8842ffc7a..ef2ef088b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -57,6 +57,7 @@
   * 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)
+  * Bump Rubocop to v0.48 (#5997)
 
 ### Site Enhancements