projects / WP-Plugins / glm-member-db-contacts.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b2d0e6 af76471)
Merge branch 'develop' into customFields
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 18 Jun 2018 17:52:14 +0000 (13:52 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 18 Jun 2018 17:52:14 +0000 (13:52 -0400)
1  2 
index.php patch | diff1 | diff2 | blob | history
models/admin/contacts/index.php patch | diff1 | diff2 | blob | history

diff --cc index.php
Simple merge
diff --cc models/admin/contacts/index.php
Simple merge