projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7175bed c3bc1ea)
Merge pull request #6493 from eileenmcnaughton/CRM-17023
authorTim Otten <totten@civicrm.org>
Mon, 17 Aug 2015 07:31:43 +0000 (00:31 -0700)
committerTim Otten <totten@civicrm.org>
Mon, 17 Aug 2015 07:31:43 +0000 (00:31 -0700)
CRM-17023 - Search settings

1  2 
CRM/Admin/Form/Setting/Search.php patch | diff1 | diff2 | blob | history
api/v3/Contact.php patch | diff1 | diff2 | blob | history
settings/Search.setting.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Admin/Form/Setting/Search.php
Simple merge
diff --cc api/v3/Contact.php
Simple merge
diff --cc settings/Search.setting.php
Simple merge