From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 17 Jan 2018 15:32:17 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.2'
X-Git-Tag: v1.0.2^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=024ec1a4a9e2c653a7cc03109bd339dc7d994ba4;p=WP-Themes%2Fcoldwater.git

Merge branch 'hotfix/1.0.2'
---

024ec1a4a9e2c653a7cc03109bd339dc7d994ba4