From 3319c0ab563c302212a684de96220ea8bfc6bd99 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 24 Sep 2014 17:07:10 -0700
Subject: [PATCH] Update history to reflect merge of #2946 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4146d17a..211b956c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,7 @@
   * Fix Rouge's RedCarpet plugin interface integration (#2951)
   * Remove `--watch` from the site template blog post since it defaults
     to watching in in 2.4.0 (#2922)
+  * Fix code for media query mixin in site template (#2946)
 
 ### Development Fixes