From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 27 Dec 2016 21:26:10 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.21'
X-Git-Tag: v1.0.21^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d6bc6a87076261339568a93b1eae76fdb9202b3d;p=WP-Themes%2Ffrancejourneys.git

Merge branch 'hotfix/1.0.21'
---

d6bc6a87076261339568a93b1eae76fdb9202b3d