From a9b95e58c6614a2c22a92b68dad5f2ace87a421f Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sun, 24 Sep 2017 11:50:56 -0400
Subject: [PATCH] Update history to reflect merge of #6331 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f66625fc..17fcc6f3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
 
   * Disable default layouts for Pages with a `layout: none` declaration (#6182)
   * Upgrade to Rouge 3 (#6381)
+  * Allow the user to set collections_dir to put all collections under one subdirectory (#6331)
 
 ## 3.6.0 / 2017-09-21