projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9490d9 36d27c1)
Merge pull request #6041 from mallezie/crm-16706
authorcolemanw <coleman@civicrm.org>
Tue, 23 Jun 2015 19:19:18 +0000 (15:19 -0400)
committercolemanw <coleman@civicrm.org>
Tue, 23 Jun 2015 19:19:18 +0000 (15:19 -0400)
merge commonLetterCompose() and commonCompose()

1  2 
CRM/Mailing/BAO/Mailing.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Mailing/BAO/Mailing.php
Simple merge