Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 4 Oct 2016 14:42:27 +0000 (10:42 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 4 Oct 2016 14:42:27 +0000 (10:42 -0400)
1  2 
setup/shortcodes.php

Simple merge