projects / WP-Plugins / glm-member-db.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eaa2053 59498c0)
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 24 May 2016 19:20:06 +0000 (15:20 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 24 May 2016 19:20:06 +0000 (15:20 -0400)
commit5f4de4d042b7712e042524c3937fc45b5c9283be
tree264fe743d8d5ca26aaac38fb06317296c3d76716tree | snapshot
parenteaa20535f2bb5828de768b6f85da0d2599ff46e3commit | diff
parent59498c07b7dbd804509b30036c56b6b6db443c15commit | diff
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop

Conflicts:
views/admin/management/index.html
views/admin/management/index.html diff1 | diff2 | blob | history