From b69196cad3449ccb4134dba8b42594dae563bdbc Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 13 Jul 2018 06:33:58 -0400
Subject: [PATCH] Update history to reflect merge of #7132 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index cbb7bebf..9a59584e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -43,6 +43,7 @@
   * Suggest re-running command with --trace on fail (#6551)
   * Update item_property to return numbers as numbers instead of strings (#6608)
   * Use .markdown for page templates (#7126)
+  * Fix custom 404 page for GitHub pages (#7132)
 
 ### Major Enhancements