From 202c4594131f2fe4bd574b0c25f0736da6479ba3 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 9 Jun 2014 18:54:24 -0400
Subject: [PATCH] Update history to reflect merge of #2485 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9ad22c99..a75976de 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
   * Add `collection` attribute to `Document#to_liquid` to access the
     document's collection label. (#2436)
   * Upgrade listen to `2.7.6 <= x < 3.0.0` (#2492)
+  * Allow configuration of different Twitter and GitHub usernames in site template (#2485)
 
 ### Bug Fixes