From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 3 Nov 2016 20:50:23 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.17'
X-Git-Tag: v1.0.17
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=fb647a10e490c9525e6ad517a0fb0356fc6cc3af;p=WP-Themes%2Ffrancejourneys.git

Merge branch 'hotfix/1.0.17'
---

7c44ed5b2dc787acb32d71aedf8107d1d035ec5b