From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 13 Nov 2017 16:54:03 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.5'
X-Git-Tag: v1.0.5^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=796c79e3ded99eacb217e3ef73117ee07bd5b06a;p=WP-Themes%2Foriginalbutterflyhouse.git

Merge branch 'hotfix/1.0.5'
---

796c79e3ded99eacb217e3ef73117ee07bd5b06a