From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 13 Oct 2016 20:28:31 +0000 (-0400)
Subject: Merge branch 'feature/ImportClicksViews' into develop
X-Git-Tag: v2.7.0^2~5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=fa65325d9923a2e07d34bb1077205c243a0e330b;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'feature/ImportClicksViews' into develop

Conflicts:
	views/admin/member/index.html
---

fa65325d9923a2e07d34bb1077205c243a0e330b