Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 17 May 2016 13:23:10 +0000 (09:23 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 17 May 2016 13:23:10 +0000 (09:23 -0400)
commit55b5405f82fb1478b275649679616a6a03cd069a
tree66c79f657ac97412a6f484ac95b6de565a086047
parent58133c985a6e6c01271a43586fb39e4fd2c50f4d
parent8962f6ce6e2b1dd222af14efdb6150abfee4b822
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop

Conflicts:
models/admin/management/index.php
models/admin/management/index.php