From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 27 Oct 2016 20:36:40 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.4'
X-Git-Tag: v1.1.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=cf96bcc042574507e572933680d19db15d57159a;p=WP-Themes%2Fjollylama.git

Merge branch 'hotfix/1.1.4'
---

cb768c49df915607ea0e2ced47736f2d17132485