From 29720674dcabb6337b93b2eac760a4c59dfeee80 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 31 Dec 2013 18:50:07 -0800
Subject: [PATCH] Update history to reflect merge of #1896

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

diff --git a/History.markdown b/History.markdown
index 9ff32c3e..9a6ebddb 100644
--- a/History.markdown
+++ b/History.markdown
@@ -53,6 +53,7 @@
   * Clarify how to access `site` in docs (#1864)
   * Add closing `<code>` tag to `context.registers[:site]` note (#1867)
   * Fix link to @mojombo's site source (#1897)
+  * Add `paginate: nil` to default configuration in docs (#1896)
 
 ## 1.4.2 / 2013-12-16