From 753bdbefbfb3c1d5327a5c72ff1ad535dc5bfc9c Mon Sep 17 00:00:00 2001
From: Matt Rogers <codemattr@gmail.com>
Date: Fri, 21 Aug 2015 10:36:37 -0500
Subject: [PATCH] Update history to reflect merge of #3925 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 292b6564..b81b2013 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
   * Remove support for relative permalinks (#3679)
   * Iterate over `site.collections` as an array instead of a hash. (#3670)
   * Adapt StaticFile for collections, config defaults (#3823)
+  * Add a Code of Conduct for the Jekyll project (#3925)
 
 ### Minor Enhancements