projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d4e756e
50577ef
)
Merge branch 4.6 into master
author
Coleman Watts
<coleman@civicrm.org>
Wed, 7 Oct 2015 18:51:50 +0000
(14:51 -0400)
committer
Coleman Watts
<coleman@civicrm.org>
Wed, 7 Oct 2015 18:51:50 +0000
(14:51 -0400)
Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
1
2
templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
Simple merge
projects / civicrm-core.git / commitdiff