From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 8 Jun 2017 18:11:50 +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=310f5c7795094c165fbcccad9ac2c91dd68826f2;p=WP-Themes%2Fparrotslanding.git

Merge branch 'hotfix/1.0.4'
---

310f5c7795094c165fbcccad9ac2c91dd68826f2