From a07f690509252d9f55900d60a641c32776c0728a Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 20 May 2014 00:16:58 -0400
Subject: [PATCH] Update history to reflect merge of #2406 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 74195fe7..1100c45e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
   * Add support for JSON files in the `_data` directory (#2369)
   * Allow subclasses to override `EXCERPT_ATTRIBUTES_FOR_LIQUID` (#2408)
   * Add `Jekyll.env` and `jekyll.environment` (the Liquid var) (#2417)
+  * Use `_config.yaml` or `_config.yml` (`.yml` takes precedence) (#2406)
 
 ### Bug Fixes