From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 5 Jun 2018 14:15:44 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=933ff070c7cb647bb4a61ddd1719ca0bc0f920a9;p=WP-Themes%2Fmurdicksmackinacfudge.git

Merge branch 'hotfix/1.0.4'
---

933ff070c7cb647bb4a61ddd1719ca0bc0f920a9