From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 22 May 2017 16:26:31 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.18'
X-Git-Tag: V1.2.18
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ff26e017b74568acf4741ba7c930cb45fa4db11c;p=WP-Themes%2FGovernmentEmmet.git

Merge branch 'hotfix/1.2.18'
---

8013d06b850656242823915308edaa6263de125f