Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 13 May 2016 19:56:30 +0000 (15:56 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 13 May 2016 19:56:30 +0000 (15:56 -0400)
commit2563d1aac2576e91d3ee96d1d4ca48fe8b27f77f
tree75825738b9fc2e54c2777589a2d218ebcd7ed69b
parentfdf5a2f8ddea0b6c141e440cc86c1b079882cada
parent7a8f07ca9107483f4eb3495ce720e87295b91e5d
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop

Conflicts:
controllers/admin.php
classes/glmPluginSupport.php
config/plugin.ini
controllers/admin.php
index.php