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
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=b66e1bd26978b037255d925a90d17d7554f1c433;p=WP-Themes%2Foriginalbutterflyhouse.git

Merge branch 'hotfix/1.0.5'
---

796c79e3ded99eacb217e3ef73117ee07bd5b06a