From b49c6508f53b43cc8240a7450417a6145c57dc2c Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Tue, 10 Dec 2013 22:58:45 -0600
Subject: [PATCH] Update history to reflect merge of #1805

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

diff --git a/History.markdown b/History.markdown
index 38076093..9bb76a58 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,8 @@
 
 ### Bug Fixes
   * Don't allow nil entries when loading posts (#1796)
+  * Remove the scrollbar that's always displayed in new sites generated
+    from the site template (#1805)
 
 ### Development Fixes
   * Add a link to the site in the README.md file (#1795)