From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 5 Jul 2016 15:41:24 +0000 (-0400)
Subject: Merge branch 'feature/shortcodeBuilder' into develop
X-Git-Tag: v2.1.16^2~5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=0c0bb824a6230574922fc3cfa1b83df2d4c41a6c;p=WP-Plugins%2Fglm-member-db.git

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

0c0bb824a6230574922fc3cfa1b83df2d4c41a6c