projects / WP-Plugins / glm-member-db.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a21439 e87f14a)
Merge branch 'develop' into feature/adminRevamp
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 4 Apr 2019 17:10:51 +0000 (13:10 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 4 Apr 2019 17:10:51 +0000 (13:10 -0400)
1  2 
controllers/admin.php patch | diff1 | diff2 | blob | history
views/admin/members/list.html patch | diff1 | diff2 | blob | history

diff --cc controllers/admin.php
Simple merge
diff --cc views/admin/members/list.html
Simple merge