projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
81e7c60
c4a27c4
)
Merge pull request #7710 from totten/master-ckeditor
author
colemanw
<coleman@civicrm.org>
Mon, 1 Feb 2016 20:04:53 +0000
(13:04 -0700)
committer
colemanw
<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