projects / WP-Plugins / glm-member-db.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 032db9d 9defa75)
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)
Conflicts:
views/front/members/detail.html


Trivial merge