From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 20 Jun 2018 12:35:57 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.25'
X-Git-Tag: v1.0.25^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=6f52699fb24cfb50d6c384ee4af7ea5009eb236d;p=WP-Themes%2Ffrancejourneys.git

Merge branch 'hotfix/1.0.25'
---

6f52699fb24cfb50d6c384ee4af7ea5009eb236d