projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb15984 93fba01)
Merge pull request #20151 from civicrm/5.37
authorEileen McNaughton <emcnaughton@wikimedia.org>
Mon, 26 Apr 2021 23:22:18 +0000 (11:22 +1200)
committerGitHub <noreply@github.com>
Mon, 26 Apr 2021 23:22:18 +0000 (11:22 +1200)
5.37 to master

1  2 
CRM/Dedupe/Merger.php patch | diff1 | diff2 | blob | history
tests/phpunit/api/v3/ContactTest.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Dedupe/Merger.php
Simple merge
diff --cc tests/phpunit/api/v3/ContactTest.php
Simple merge