From 0c172f6463b8b7ca574b352b37cf287eaebbc773 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 23 Mar 2016 17:01:16 -0700
Subject: [PATCH] Update history to reflect merge of #4533 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index bd5ee7a2..ad1a7345 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,7 @@
   * 'jekyll clean': also remove .sass-cache (#4652)
   * 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)
 
 ### Bug Fixes