projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7b3f58f
360269e
)
Merge pull request #10998 from michaelmcandrew/CRM-21197
author
Mathieu Lu
<mathieu@bidon.ca>
Wed, 20 Dec 2017 14:53:25 +0000
(09:53 -0500)
committer
GitHub
<noreply@github.com>
Wed, 20 Dec 2017 14:53:25 +0000
(09:53 -0500)
CRM-21197 Convert from html to plain text AFTER token substitution has happened
1
2
CRM/Mailing/BAO/Mailing.php
patch
|
diff1
|
diff2
|
blob
|
history
tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php
patch
|
diff1
|
diff2
|
blob
|
history
xml/templates/civicrm_data.tpl
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CRM/Mailing/BAO/Mailing.php
Simple merge
diff --cc
tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php
Simple merge
diff --cc
xml/templates/civicrm_data.tpl
Simple merge
projects / civicrm-core.git / commitdiff