From 45aac995d81dc2ac9f2d301e7c0819b7b55a4e79 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Thu, 1 Sep 2016 17:18:51 -0700
Subject: [PATCH] Update history to reflect merge of #5308 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 21f959f1..3ab9086e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -48,6 +48,7 @@
   * Update AppVeyor config. (#5240)
   * Execute jekyll from clone instead of defined binary when running 'script/default-site' (#5295)
   * rubocop: lib/jekyll/document.rb complexity fixes (#5045)
+  * Proxy a number of Convertible methods to Renderer (#5308)
 
 ## 3.2.1 / 2016-08-02