From 8e5392e9d9bf6f2f0c5390cc4014105b3d37c8aa Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 7 May 2014 13:36:44 -0400
Subject: [PATCH] Update history to reflect merge of #2331 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 0402849d..c8e8e004 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,7 @@
   * Properly prefix links in site template with URL or baseurl depending upon
     need. (#2319)
   * Update gist tag comments and error message to require username (#2326)
+  * Fix `permalink` setting in site template (#2331)
 
 ### Development Fixes