Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 20 Oct 2016 20:50:30 +0000 (16:50 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 20 Oct 2016 20:50:30 +0000 (16:50 -0400)
commit718026524cbc351929f176a1fac4c9912e535ff9
tree10db3eecd506959b76d2b288274e08de8bfdf9a7
parentfc5bb0004c335b92ffb0b6ee204e341bc3896d6d
parent2e0b741d87c8e6e7a538a3a4203d132af24c6e1a
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.20.sql
classes/data/settings/dataSettingsGeneral.php
index.php
setup/databaseScripts/create_database_V1.1.20.sql
setup/databaseScripts/create_database_V1.1.21.sql
setup/databaseScripts/dbVersions.php
setup/databaseScripts/drop_database_V1.1.20.sql
setup/databaseScripts/drop_database_V1.1.21.sql
setup/databaseScripts/update_database_V1.1.20.sql
setup/databaseScripts/update_database_V1.1.21.sql
views/admin/management/index.html