projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
270d9d5
a519428
)
Merge pull request #12053 from civicrm/5.1
author
Eileen McNaughton
<eileen@mcnaughty.com>
Sun, 29 Apr 2018 07:47:24 +0000
(19:47 +1200)
committer
GitHub
<noreply@github.com>
Sun, 29 Apr 2018 07:47:24 +0000
(19:47 +1200)
merge 5.1 to master
1
2
CRM/Contact/Form/Search.php
patch
|
diff1
|
diff2
|
blob
|
history
CRM/Contact/Form/Search/Criteria.php
patch
|
diff1
|
diff2
|
blob
|
history
CRM/Upgrade/Form.php
patch
|
diff1
|
diff2
|
blob
|
history
CRM/Utils/VersionCheck.php
patch
|
diff1
|
diff2
|
blob
|
history
templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CRM/Contact/Form/Search.php
Simple merge
diff --cc
CRM/Contact/Form/Search/Criteria.php
Simple merge
diff --cc
CRM/Upgrade/Form.php
Simple merge
diff --cc
CRM/Utils/VersionCheck.php
Simple merge
diff --cc
templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
Simple merge
projects / civicrm-core.git / commitdiff