Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 22 Aug 2016 18:32:52 +0000 (14:32 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 22 Aug 2016 18:32:52 +0000 (14:32 -0400)
1  2 
index.php
models/front/members/list.php

diff --cc index.php
Simple merge
Simple merge