From 390c98045c1c93a21cd026173605bae5c00d7203 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 25 Jun 2016 14:47:30 -0700
Subject: [PATCH] Update history to reflect merge of #5031 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index df8ffeb5..26abe6e3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -103,6 +103,7 @@
   * rubocop: lib/jekyll/regenerator.rb (#5025)
   * rubocop: lib/jekyll/configuration.rb (#5024)
   * rubocop: lib/jekyll/renderer.rb style fixes (#5032)
+  * rubocop: lib/jekyll/convertible.rb style fixes (#5031)
 
 ### Site Enhancements