projects / WP-Plugins / glm-member-db.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c8733e 0789731)
Merge branch 'feature/ImportClicksViews' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 13 Oct 2016 20:28:31 +0000 (16:28 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 13 Oct 2016 20:28:31 +0000 (16:28 -0400)
Conflicts:
views/admin/member/index.html


Trivial merge