From f1ac1f21252ae7a2da405c0eb365b09fbc07086e Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 20 Jan 2016 11:07:34 -0800
Subject: [PATCH] Update history to reflect merge of #4376 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 729d80b9..f3f6b1ba 100644
--- a/History.markdown
+++ b/History.markdown
@@ -39,6 +39,7 @@
   * Allow custom file extensions if defined in `permalink` YAML front matter (#4314)
   * Fix deep_merge_hashes! handling of drops and hashes (#4359)
   * Page should respect output extension of its permalink (#4373)
+  * Disable auto-regeneration when running server detached (#4376)
 
 ### Development Fixes