From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 2 Feb 2018 16:05:09 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.12'
X-Git-Tag: v1.0.12
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2ed1af9deb21fc244d5d0a1a6a13951c6d8a298c;p=WP-Themes%2Ftroutcreek.git

Merge branch 'hotfix/1.0.12'
---

44f033f28e500ef14e42fcfad826986122f14730