From c6564d352b3452382c68bb0de6b0dc0be32d30da Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 23 Mar 2016 17:49:47 -0700
Subject: [PATCH] Update history to reflect merge of #4542 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ad1a7345..849ef11f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,6 +13,7 @@
   * Clean up Tags::PostUrl a bit, including better errors and date parsing (#4670)
   * Use String#encode for xml_escape filter instead of CGI.escapeHTML (#4694)
   * Add show_dir_listing option for serve command and fix index file names (#4533)
+  * Site Template: write a Gemfile which is educational to the new site (#4542)
 
 ### Bug Fixes