Merge pull request #11442 from civicrm/revert-10998-CRM-21197
authorTim Otten <totten@civicrm.org>
Thu, 21 Dec 2017 08:34:39 +0000 (00:34 -0800)
committerGitHub <noreply@github.com>
Thu, 21 Dec 2017 08:34:39 +0000 (00:34 -0800)
commit9d2a2a8c5470d09c97dfec5ba2ab48c51f5e7e58
tree903377be3c24a789f96afaf934b35551dba61969
parentd0127d848051a13bda47f1a35bd79b8ce4474cfe
parent76c970f80737d77c00790c955b03295545c740f4
Merge pull request #11442 from civicrm/revert-10998-CRM-21197

Revert "CRM-21197 Convert from html to plain text AFTER token substitution has happened"