From 9d205fe43ce2228c867492ef936dfb82f118ece9 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 6 May 2014 14:37:43 -0400
Subject: [PATCH] Update history to reflect merge of #2298 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1732896f..498824fc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -216,6 +216,9 @@
   * Use black text color for the mobile navbar (#2306)
   * Use the built in date filter and `site.time` for the copyright year. (#2305)
   * Update html5shiv to v3.7.2 (#2304)
+  * Add 2.0.0 release post (#2298)
+  * Add docs for custom markdown processors (#2298)
+  * Add docs for `where` and `group_by` Liquid filters (#2298)
 
 ## 1.5.1 / 2014-03-27