From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 21 Jun 2017 20:17:02 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.12'
X-Git-Tag: v1.0.12
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e05d06bb317d07c992e1867e74324aa5be3c1520;p=WP-Themes%2Fparrotslanding.git

Merge branch 'hotfix/1.0.12'
---

42ed72887461d58a8f7cff6d449830d46526f3fe