From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 11 Apr 2018 17:42:15 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.2'
X-Git-Tag: v1.0.2^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=faa034fe0b79d50c2b59454afcd65247a9ce7f7f;p=WP-Themes%2Fresorttownship.git

Merge branch 'hotfix/1.0.2'
---

faa034fe0b79d50c2b59454afcd65247a9ce7f7f