From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 15 Dec 2016 14:34:16 +0000 (-0500)
Subject: Merge branch 'develop' into hotfix/1.2.31
X-Git-Tag: v1.2.31^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=403c7abd54fdad7967e027c369335669432ceaf3;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'develop' into hotfix/1.2.31
---

403c7abd54fdad7967e027c369335669432ceaf3