Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 16 Feb 2016 15:27:35 +0000 (10:27 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 16 Feb 2016 15:27:35 +0000 (10:27 -0500)
commitac5814340e323ddf6aa5c2ecd1938b30521cd69f
tree82200f36bec86e2b40d5240471cfffef3a731c34
parent014973150425794d5fd5c31b84eb689c7e88eeab
parent222793db8226438cb569c7b647f3107be82c65dc
Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop

Conflicts:
glm-member-db.php
views/admin/members/index.html
css/front.css
glm-member-db.php
views/admin/members/index.html