From 4b2b5ea8b1150fbee3bc1ccdec4b807e4d096d4c Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 17 Jun 2015 10:50:12 -0700
Subject: [PATCH] Update history to reflect merge of #3795

[ci skip]
---
 History.markdown | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/History.markdown b/History.markdown
index 295ec193..6df5be8f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -79,6 +79,7 @@
   * Performance: Sort files only once (#3707)
   * Performance: Marshal metadata (#3706)
   * Upgrade highlight wrapper from `div` to `figure` (#3779)
+  * Upgrade mime-types to `~> 2.6` (#3795)
 
 ### Bug Fixes
 
@@ -145,6 +146,7 @@
   * Force minitest version to 5.5.1 (#3657)
   * Update the way cucumber accesses Minitest assertions (#3678)
   * Add `script/rubyprof` to generate cachegrind callgraphs (#3692)
+  * Upgrade cucumber to 2.x (#3795)
 
 ### Site Enhancements