Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 4 Aug 2016 18:41:42 +0000 (14:41 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 4 Aug 2016 18:41:42 +0000 (14:41 -0400)
commit4fbc0b8cf577211666cb948ea6d381fc53a7fefe
tree21b85b2667b6ab92304fe915b1c6ce18c589ed83
parent51f9ad485a2c062baa6edbfa35197cf8cfcf47d8
parentce62dead5804c218bc5188939ecbdc64d6d377d9
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop

Conflicts:
index.php
setup/databaseScripts/dbVersions.php
setup/databaseScripts/update_database_V1.1.12.sql
setup/validActions.php
controllers/admin.php
index.php
setup/databaseScripts/1.1.13-Pending-Chuck
setup/databaseScripts/create_database_V1.1.12.sql
setup/databaseScripts/create_database_V1.1.13.sql
setup/databaseScripts/dbVersions.php
setup/databaseScripts/drop_database_V1.1.13.sql
setup/databaseScripts/update_database_V1.1.12.sql
setup/databaseScripts/update_database_V1.1.13.sql
setup/validActions.php