From 2053a8fa8c74c5f36bd4e29e8961e19de479cf5e Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 12 Mar 2013 19:07:51 +0100
Subject: [PATCH] Update history to reflect merge of #847

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

diff --git a/History.txt b/History.txt
index f306e9e3..e620d380 100644
--- a/History.txt
+++ b/History.txt
@@ -4,6 +4,7 @@
     * Removed importers/migrators from main project, migrated to jekyll-import sub-gem (#793)
     * Added ability to render drafts in _drafts folder via command line (#833)
   * Minor Enhancements
+    * Load in Apache MIME Types on `jekyll serve` (#847)
     * Improve debugability of error message for a malformed highlight tag (#785)
     * Allow symlinked files in unsafe mode (#824)
     * Add 'gist' liquid tag to core (#822)