From cd3831296a5cb1be176db4d97daf69d9ebd238d5 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 14 Nov 2016 14:28:37 -0800
Subject: [PATCH] Update history to reflect merge of #5572 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index a408b0f2..b5714d0b 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
   * `jekyll new-theme` should specify Jekyll as a runtime dependency for the theme (#5457)
   * Be much more specific about ignoring specific vendored directories. (#5564)
   * Only warn about auto-regeneration bug on Bash On Windows. (#5464)
+  * Allow permalink template to have underscores (#5572)
 
 ### Development Fixes