Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Sat, 3 Oct 2015 16:08:44 +0000 (12:08 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Sat, 3 Oct 2015 16:08:44 +0000 (12:08 -0400)
commit6a0b83f0400a23d27c4b6ec07f5505864431994b
treefc4a85082eb264952b7ba74edac9ff3cd766ccdd
parent032db9de1f2fd098dfc860557db85f536d1c7671
parent9defa750e2280b335d1c8a710f9f3d8949e214ef
Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop

Conflicts:
views/front/members/detail.html