From: Chuck Scott <cscott@gaslightmedia.com>
Date: Fri, 3 Aug 2018 14:29:30 +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=90255cd36f72c0018785a5d3f14908fa80b0dd9f;p=WP-Themes%2Fresorttownship.git

Merge branch 'hotfix/1.0.4'
---

90255cd36f72c0018785a5d3f14908fa80b0dd9f