From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 22 Jun 2017 13:16:22 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.31'
X-Git-Tag: v1.0.31^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=aa2852af4ad94924c6c686446fe3cdd19453d37c;p=WP-Themes%2FFairEmmet.git

Merge branch 'hotfix/1.0.31'
---

aa2852af4ad94924c6c686446fe3cdd19453d37c