From 92ba22f8fe30dc9bbe53585f60586c77e7cc3e14 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 9 Jan 2016 18:11:48 -0800
Subject: [PATCH] Update history to reflect merge of #4314 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 03ba1bd5..738185c5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -35,6 +35,7 @@
   * Drop: fix hash setter precendence (#4312)
   * utils: `has_yaml_header?` should accept files with extraneous spaces (#4290)
   * Escape html from site.title and page.title in site template (#4307)
+  * Allow custom file extensions if defined in `permalink` YAML front matter (#4314)
 
 ### Development Fixes