From: Ian Weller <ian@gaslightmedia.com>
Date: Mon, 10 Jul 2017 18:23:01 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2:WP-Themes/troutcreek into develop
X-Git-Tag: v1.0.0^2~39
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5736f893b3cb53e9cb71e4676459dda50675e8bb;p=WP-Themes%2Ftroutcreek.git

Merge branch 'develop' of cvs2:WP-Themes/troutcreek into develop
---

5736f893b3cb53e9cb71e4676459dda50675e8bb