From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 12 Sep 2016 19:17:40 +0000 (-0400)
Subject: Merge tag 'v1.0.4' into develop
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3e0325c185782e340535bb3646f1b1e498499421;p=WP-Themes%2Fupwatertrails.git

Merge tag 'v1.0.4' into develop

switching archive and categories in blog sidebar
---

3e0325c185782e340535bb3646f1b1e498499421