From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 1 Mar 2018 14:00:38 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.25'
X-Git-Tag: v1.0.25^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=5d403e134b3e92dd3bd536d3e768e29d54f03b9e;p=WP-Themes%2Fmackinawferry.git

Merge branch 'hotfix/1.0.25'
---

5d403e134b3e92dd3bd536d3e768e29d54f03b9e