From c6b4c41aabb04efe6a77cfc8642ee360d284b6a1 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 15 Feb 2014 17:28:06 -0500
Subject: [PATCH] Update history to reflect merge of #2048 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8d9da479..318b96e6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -39,6 +39,7 @@
   * Default to using the UTF-8 encoding when reading files. (#2031)
   * Update Redcarpet dependency to ~> 3.1 (#2044)
   * Remove support for Ruby 1.9.2 (#2045)
+  * Add `.mkdown` as valid Markdown extension (#2048)
 
 ### Bug Fixes
   * Don't allow nil entries when loading posts (#1796)