Merge pull request #10998 from michaelmcandrew/CRM-21197
authorMathieu Lu <mathieu@bidon.ca>
Wed, 20 Dec 2017 14:53:25 +0000 (09:53 -0500)
committerGitHub <noreply@github.com>
Wed, 20 Dec 2017 14:53:25 +0000 (09:53 -0500)
commit73c37eb63179394e2195c642480eb0c13ed217bb
treeb0b2636ff91806cc2b0161f8c45a5675bcec0f3d
parent7b3f58fad379c9d96c3ae9ea680b25a3bb4154f1
parent360269e5c3d8e900c6f404b882bafd6c331a4e06
Merge pull request #10998 from michaelmcandrew/CRM-21197

CRM-21197 Convert from html to plain text AFTER token substitution has happened
CRM/Mailing/BAO/Mailing.php
tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php
xml/templates/civicrm_data.tpl