From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 27 Dec 2016 20:27:35 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.20'
X-Git-Tag: v1.0.20
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=b7744db94730b817e9253126825443a1804df890;p=WP-Themes%2Ffrancejourneys.git

Merge branch 'hotfix/1.0.20'
---

4714e34ce96e099a55278bdb3c4791123bdf33f7