From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 16 Jun 2017 18:18:06 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.5'
X-Git-Tag: v1.0.5^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2f532c5383bb63b9b4d305e6eb35eed0760cef94;p=WP-Themes%2Fparrotslanding.git

Merge branch 'hotfix/1.0.5'
---

2f532c5383bb63b9b4d305e6eb35eed0760cef94