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)
commitfb15a26764e07bc36168929212225aa1dbb9c58a
treedc7f4a6c66d475cc4bda89cd04f2bf225a94073d
parentf30b8cdbb7af1a8464f98ac0dc4e50fb1ad214f3
parent841c0eebe3029568c864b33f24b58a533de0cc6b
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
setup/shortcodes.php