From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 21 Jun 2017 19:15:47 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.11'
X-Git-Tag: v1.0.11^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=7f2c53cd485d35b5615c6716c77a56d0c65f61a4;p=WP-Themes%2Fparrotslanding.git

Merge branch 'hotfix/1.0.11'
---

7f2c53cd485d35b5615c6716c77a56d0c65f61a4