From 85bd3836d0b70e9042472102f65b1ce8a947c2da Mon Sep 17 00:00:00 2001
From: Parker Moore <email@byparker.com>
Date: Wed, 6 Aug 2014 15:29:43 -0400
Subject: [PATCH] Update history to reflect merge of #2688 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6d8adf30..dcaeb95f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -33,6 +33,7 @@
   * Add note that source directory cannot be modified in GitHub Pages (#2669)
   * Fix links from #2669 to be actual HTML. Whoops. (#2679)
   * Add link to `jekyll-slim` in list of third-party plugins (#2689)
+  * Add Barry Clark's Smashing Magazine tutorial to resources page (#2688)
 
 ## 2.2.0 / 2014-07-29