From ea7e8951d804e77250c482f53752ecb667ee43f1 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 2 Aug 2014 00:05:26 -0400
Subject: [PATCH] Update history to reflect merge of #2680 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d9984223..7c7b8060 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,6 +6,7 @@
 
   * Use `.scss` for `site_template` styles. (#2667)
   * Don't require the `scope` key in front matter defaults (#2659)
+  * No longer set `permalink: pretty` in the `_config.yml` for the site template (#2680)
 
 ### Bug Fixes