From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 16 Jun 2016 17:12:25 +0000 (-0400)
Subject: Merge branch 'develop' into feature/shortcodeBuilder
X-Git-Tag: v2.1.16^2~5^2~15
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=276dd102bf726852418b564844c1080318b7dc44;p=WP-Plugins%2Fglm-member-db.git

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

276dd102bf726852418b564844c1080318b7dc44