projects / WP-Plugins / glm-member-db-contacts.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd31eb6 c0381db)
Merge branch 'develop' into feature/revamp
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 7 Aug 2018 19:16:58 +0000 (15:16 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 7 Aug 2018 19:16:58 +0000 (15:16 -0400)
1  2 
classes/data/dataContacts.php patch | diff1 | diff2 | blob | history
models/admin/contacts/index.php patch | diff1 | diff2 | blob | history

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