Merge pull request #5687 from relldoesphp/ckeditor_fix
authorcolemanw <coleman@civicrm.org>
Wed, 29 Apr 2015 22:08:09 +0000 (16:08 -0600)
committercolemanw <coleman@civicrm.org>
Wed, 29 Apr 2015 22:08:09 +0000 (16:08 -0600)
commitf5e2d79934502b8d28a8e9a8f1c31f9af0e1c7a1
tree651dede35069374ec91d88cd5ba6b19218afbd26
parent26c3d90804afbe06e861a3141e18d7d73e86a24e
parent6cc256693c25de60d6877cdccf47243c545c5531
Merge pull request #5687 from relldoesphp/ckeditor_fix

CRM-16354 Upgrade CkEditor
CRM/Admin/Form/Options.php
CRM/Contact/Form/Relationship.php
CRM/Contribute/Form/Task/Invoice.php
CRM/Core/Form.php
CRM/Event/Page/ManageEvent.php
js/Common.js