From c9a732c4f9da15214d9d3b65268f0e7fc47cd01c Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 26 Jan 2014 13:39:31 -0500
Subject: [PATCH] Update history to reflect merge of #1993 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index aa6bcfc3..bba40c54 100644
--- a/History.markdown
+++ b/History.markdown
@@ -31,6 +31,8 @@
     (#1875)
   * Route 404 errors to a custom 404 page in development (#1899)
   * Excludes are now relative to the site source (#1916)
+  * Bring MIME Types file for `jekyll serve` to complete parity with GH Pages
+    servers (#1993)
 
 ### Bug Fixes
   * Don't allow nil entries when loading posts (#1796)