From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 30 Apr 2019 21:47:00 +0000 (-0400)
Subject: Merge branch 'master' into develop
X-Git-Tag: v1.0.16^2~3
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=6b3cbe5aa48183fd3db2ac1bebc42d0d4bc96020;p=WP-Themes%2Fparrotslanding.git

Merge branch 'master' into develop
---

6b3cbe5aa48183fd3db2ac1bebc42d0d4bc96020