Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db-events into develop
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 24 Feb 2017 16:56:13 +0000 (11:56 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 24 Feb 2017 16:56:13 +0000 (11:56 -0500)
1  2 
index.php
setup/adminHooks.php

diff --cc index.php
Simple merge
Simple merge