From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 11 Oct 2016 14:35:21 +0000 (-0400)
Subject: Merge branch 'develop' into feature/dashboard
X-Git-Tag: v1.5.0^2~1^2~4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=36ce6d77d32a5af47203ba336d8f5b8de2bf7c42;p=WP-Plugins%2Fglm-member-db-events.git

Merge branch 'develop' into feature/dashboard
---

36ce6d77d32a5af47203ba336d8f5b8de2bf7c42