Merge pull request #7206 from colemanw/wysiwyg
authorcolemanw <coleman@civicrm.org>
Fri, 13 Nov 2015 22:02:12 +0000 (17:02 -0500)
committercolemanw <coleman@civicrm.org>
Fri, 13 Nov 2015 22:02:12 +0000 (17:02 -0500)
commit440e294df3479211688ba29957d3e98f5a7188fd
tree5aca5e748ba5524dd1ad445041a43c1f9941eb7b
parent8d846c8b83ad007b008e89f35cccce7e22822a71
parentb939ff36adb10f4c2f19a87cb4132d8402a9f7ad
Merge pull request #7206 from colemanw/wysiwyg

wysiwyg fixes