From: Tim Otten <totten@civicrm.org>
Date: Sat, 11 Apr 2015 04:23:32 +0000 (-0700)
Subject: Merge pull request #5608 from totten/4.6-ckeditor-upload
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e74c9213aa9e4da89e9412640cbd9412e9ef7232;p=civicrm-core.git

Merge pull request #5608 from totten/4.6-ckeditor-upload

CRM-16253 - crmUiRichtext - Enable file uploads
---

e74c9213aa9e4da89e9412640cbd9412e9ef7232