From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 16 Jun 2017 20:06:52 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.6'
X-Git-Tag: v1.0.6^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=fe3d3e1d45c3b0d65ede87b0f12c1868d581b4b1;p=WP-Themes%2Fparrotslanding.git

Merge branch 'hotfix/1.0.6'
---

fe3d3e1d45c3b0d65ede87b0f12c1868d581b4b1