From 1c7aa4729efce24dd0757c0ac4da800a530a0c3d Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Thu, 29 Sep 2016 13:25:30 -0700
Subject: [PATCH] Update history to reflect merge of #5412 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d73c59b1..928ccab8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -84,6 +84,7 @@
   * remove features' directories on windows with proper access (#5389)
   * `site_configuration.feature`: use UTC format in timezone (#5416)
   * swallow bundle output from `jekyll new` while in CI (#5408)
+  * Add .editorconfig (#5412)
 
 ## 3.2.1 / 2016-08-02