projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cb1980 fe045bc)
Merge pull request #12072 from civicrm/5.1
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 2 May 2018 08:46:29 +0000 (20:46 +1200)
committerGitHub <noreply@github.com>
Wed, 2 May 2018 08:46:29 +0000 (20:46 +1200)
5.1 merge to master

1  2 
CRM/Contact/Form/Search.php patch | diff1 | diff2 | blob | history
CRM/Contact/StateMachine/Search.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Contact/Form/Search.php
Simple merge
diff --cc CRM/Contact/StateMachine/Search.php
Simple merge