From 565567ac08ac1c3db5129aa55e3c6996f2070c82 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sun, 8 Jul 2018 14:04:43 -0400
Subject: [PATCH] Update history to reflect merge of #7105 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 63f1220a..f8aa4ecd 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * Update travis-ci.md to point out &#34;this is an example Gemfile&#34; (#7089)
   * Adding `jekyll-info` plugin (#7091)
   * GitHub enables you to use themes from other repos (#7112)
+  * Updates to CODE OF CONDUCT  (v1.4.0) (#7105)
 
 ### Minor Enhancements