From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 7 Mar 2018 16:46:43 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.5'
X-Git-Tag: v1.0.5^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;p=WP-Themes%2Fupwatertrails.git

Merge branch 'hotfix/1.0.5'
---

ace05a29970dcb7fb639012f8e48edf159a1f08d