From 2989a9a81be6e374af08832cf1d7d2f24f73eac1 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 19 Aug 2017 07:20:01 -0400
Subject: [PATCH] Update history to reflect merge of #6325 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index bd64aa87..44c94640 100644
--- a/History.markdown
+++ b/History.markdown
@@ -3,6 +3,7 @@
   * update Jekyll&#39;s README (#6321)
   * add SUPPORT file for GitHub (#6324)
   * Plugins is the new gems (#6326)
+  * Rename CODE_OF_CONDUCT to show in banner (#6325)
 
 ### Development Fixes