From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 30 Aug 2017 19:08:39 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=e9a1f3550ab024353b98b37a7ea4f889a1e0b97c;p=WP-Themes%2Ftroutcreek.git

Merge branch 'hotfix/1.0.4'
---

e9a1f3550ab024353b98b37a7ea4f889a1e0b97c