From: colemanw <coleman@civicrm.org>
Date: Mon, 1 Feb 2016 20:04:53 +0000 (-0700)
Subject: Merge pull request #7710 from totten/master-ckeditor
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9af04d6c1dcf478facfa31d42babf7f9271190d4;p=civicrm-core.git

Merge pull request #7710 from totten/master-ckeditor

CRM-17924 - crm.ckeditor.js - Allow email-style tags+attributes
---

9af04d6c1dcf478facfa31d42babf7f9271190d4