Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop

author Chuck Scott <cscott@gaslightmedia.com>

Wed, 18 May 2016 18:03:23 +0000 (14:03 -0400)

committer Chuck Scott <cscott@gaslightmedia.com>

Wed, 18 May 2016 18:03:23 +0000 (14:03 -0400)
author Chuck Scott <cscott@gaslightmedia.com>
Wed, 18 May 2016 18:03:23 +0000 (14:03 -0400)
committer Chuck Scott <cscott@gaslightmedia.com>
Wed, 18 May 2016 18:03:23 +0000 (14:03 -0400)
diff --cc classes/glmPluginSupport.php
Simple merge
diff --cc controllers/admin.php
Simple merge
diff --cc models/front/members/list.php
Simple merge
diff --cc views/front/members/list.html
Simple merge
author	Chuck Scott <cscott@gaslightmedia.com>
	Wed, 18 May 2016 18:03:23 +0000 (14:03 -0400)
committer	Chuck Scott <cscott@gaslightmedia.com>
	Wed, 18 May 2016 18:03:23 +0000 (14:03 -0400)
		1	2
classes/glmPluginSupport.php	patch \|	diff1 \|	diff2 \|	blob \| history
controllers/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history
models/front/members/list.php	patch \|	diff1 \|	diff2 \|	blob \| history
views/front/members/list.html	patch \|	diff1 \|	diff2 \|	blob \| history