From c0fa8702af59956cc9983ab559298c13b22e28bb Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 3 May 2014 18:21:04 -0400
Subject: [PATCH] Update history to reflect merge of #2290 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 5be4ac50..b1ad1f74 100644
--- a/History.markdown
+++ b/History.markdown
@@ -130,6 +130,7 @@
   * Refactor `Commands::Serve`. (#2269)
   * Refactor `highlight` tag (#2154)
   * Update `Util` hash functions with latest from Rails (#2273)
+  * Workaround for Travis bug (#2290) 
 
 ### Site Enhancements
   * Document Kramdown's GFM parser option (#1791)