From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 27 Dec 2016 20:53:22 +0000 (-0500)
Subject: Merge tag 'v1.1.7' into develop
X-Git-Tag: v1.1.9^2~4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=af60dceca6d1153d3d2abace676bafe2113ee51a;p=WP-Themes%2Fjollylama.git

Merge tag 'v1.1.7' into develop

version 1.1.7
---

af60dceca6d1153d3d2abace676bafe2113ee51a