From 0c5b74377bd59c5e8001643800ca8a812818b491 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 7 May 2018 13:49:56 -0400
Subject: [PATCH] Update history to reflect merge of #6994 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ce9fc970..95eab348 100644
--- a/History.markdown
+++ b/History.markdown
@@ -13,6 +13,7 @@
   * Add version number for group_by_exp doc (#6956)
   * Update Windows install docs (#6926)
   * Remove documentation for using Redcarpet (#6990)
+  * Updated nginx configuration for custom-404-page documentation (#6994)
 
 ### Minor Enhancements