From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 7 Mar 2018 20:18:03 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.14'
X-Git-Tag: v1.0.14
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f958f69375b59b948ba326680d86de514711ccde;p=WP-Themes%2Fparrotslanding.git

Merge branch 'hotfix/1.0.14'
---

35dc8b5f18bd40cf85d28f1211569f08d67d1d80