From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 3 Nov 2017 20:32:31 +0000 (-0400)
Subject: Merge branch 'develop' into customFields
X-Git-Tag: v2.10.23^2~25
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=0c155d464243664f0cc33a5642db0fd42f7da0c2;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'develop' into customFields
---

0c155d464243664f0cc33a5642db0fd42f7da0c2