From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 2 Nov 2016 15:26:58 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.12'
X-Git-Tag: v1.0.12^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=9afe35095cfedd6f1c4490a768a9bdff60a7b239;p=WP-Themes%2Ffrancejourneys.git

Merge branch 'hotfix/1.0.12'
---

9afe35095cfedd6f1c4490a768a9bdff60a7b239