projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9a2d15b
5e738d5
)
Merge remote-tracking branch 'origin/5.37' into 5372
author
Seamus Lee
<seamuslee001@gmail.com>
Mon, 3 May 2021 03:21:38 +0000
(13:21 +1000)
committer
Seamus Lee
<seamuslee001@gmail.com>
Mon, 3 May 2021 03:21:38 +0000
(13:21 +1000)
1
2
ext/search_kit/Civi/Api4/Action/SearchDisplay/Run.php
patch
|
diff1
|
diff2
|
blob
|
history
ext/search_kit/Civi/Api4/SearchDisplay.php
patch
|
diff1
|
diff2
|
blob
|
history
ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
ext/search_kit/Civi/Api4/Action/SearchDisplay/Run.php
Simple merge
diff --cc
ext/search_kit/Civi/Api4/SearchDisplay.php
Simple merge
diff --cc
ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php
Simple merge