From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Tue, 15 Nov 2016 15:25:39 +0000 (-0500)
Subject: Merge branch 'release/1.0.18'
X-Git-Tag: v1.0.18^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=fe3f58e1801728c66ce1049988ab2f78cf8abb7e;p=WP-Themes%2Ffrancejourneys.git

Merge branch 'release/1.0.18'
---

fe3f58e1801728c66ce1049988ab2f78cf8abb7e