projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fa580b2
2978fbf
)
Merge 5.25
author
Seamus Lee
<seamuslee001@gmail.com>
Thu, 16 Apr 2020 02:11:08 +0000
(12:11 +1000)
committer
Seamus Lee
<seamuslee001@gmail.com>
Thu, 16 Apr 2020 02:11:08 +0000
(12:11 +1000)
1
2
CRM/Activity/BAO/Activity.php
patch
|
diff1
|
diff2
|
blob
|
history
CRM/Contact/BAO/Query.php
patch
|
diff1
|
diff2
|
blob
|
history
templates/CRM/Case/Form/ActivityView.tpl
patch
|
diff1
|
diff2
|
blob
|
history
tests/phpunit/api/v3/ContactTest.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CRM/Activity/BAO/Activity.php
Simple merge
diff --cc
CRM/Contact/BAO/Query.php
Simple merge
diff --cc
templates/CRM/Case/Form/ActivityView.tpl
Simple merge
diff --cc
tests/phpunit/api/v3/ContactTest.php
Simple merge
projects / civicrm-core.git / commitdiff