From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 24 Jun 2016 14:46:59 +0000 (-0400)
Subject: Merge branch 'develop' into feature/shortcodeBuilder
X-Git-Tag: v2.1.16^2~5^2~7
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=a623799b18b2f25df89795ee9c36a4f0593f505b;p=WP-Plugins%2Fglm-member-db.git

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

a623799b18b2f25df89795ee9c36a4f0593f505b