Merge pull request #6588 from totten/master-rm-old-civimail
authorTim Otten <totten@civicrm.org>
Sat, 29 Aug 2015 14:36:52 +0000 (07:36 -0700)
committerTim Otten <totten@civicrm.org>
Sat, 29 Aug 2015 14:36:52 +0000 (07:36 -0700)
CRM-15578 - CiviMail - Remove legacy composition UI

1  2 
CRM/Utils/Token.php

Simple merge