Merge pull request #7710 from totten/master-ckeditor
authorcolemanw <coleman@civicrm.org>
Mon, 1 Feb 2016 20:04:53 +0000 (13:04 -0700)
committercolemanw <coleman@civicrm.org>
Mon, 1 Feb 2016 20:04:53 +0000 (13:04 -0700)
CRM-17924 - crm.ckeditor.js - Allow email-style tags+attributes


Trivial merge