From 990809ba0793c09e0801ed87933c6de686025765 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 24 Mar 2017 16:21:38 -0400
Subject: [PATCH] Update history to reflect merge of #5946 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6140fb92..72a24fa3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,7 @@
   * Included more details about adding defaults to static files (#5971)
   * Create buddyworks (#5962)
   * added (buddyworks) to ci list (#5965)
+  * Add a tutorial on serving custom Error 404 page (#5946)
 
 ### Development Fixes