From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 28 Apr 2016 13:31:21 +0000 (-0400)
Subject: Merge tag 'v1.0.0' into develop
X-Git-Tag: v1.1.0^2~12
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=03275f18a30f4b3baa82b93c2a2eb770fa51a0b5;p=WP-Themes%2Fjollylama.git

Merge tag 'v1.0.0' into develop

v1.0.0
---

03275f18a30f4b3baa82b93c2a2eb770fa51a0b5