From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 10 Nov 2017 14:17:30 +0000 (-0500)
Subject: Merge branch 'develop' into customFields
X-Git-Tag: v2.10.23^2~24
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=1e14660beb89341fdace5a58510430c83cbdf918;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'develop' into customFields
---

1e14660beb89341fdace5a58510430c83cbdf918