Reviewed: https://reviews.mahara.org/5815 Committed: https://git.mahara.org/mahara/mahara/commit/98663059d8a3f12dade160aa3e4816cff8d5f278 Submitter: Robert Lyon (<email address hidden>) Branch: 15.10_STABLE
commit 98663059d8a3f12dade160aa3e4816cff8d5f278 Author: Aaron Wells <email address hidden> Date: Mon Nov 30 18:24:44 2015 +1300
Revert bad merge changes in tinymce.jquery.js
Bug 1521058
behatnotneeded: Covered by existing tests
Change-Id: I7f4d2a290375074551f72ce2db731b80cab5c278 (cherry picked from commit c687a52a1dde353ec37db09402e62225a246a5ed)
Reviewed: https:/ /reviews. mahara. org/5815 /git.mahara. org/mahara/ mahara/ commit/ 98663059d8a3f12 dade160aa3e4816 cff8d5f278
Committed: https:/
Submitter: Robert Lyon (<email address hidden>)
Branch: 15.10_STABLE
commit 98663059d8a3f12 dade160aa3e4816 cff8d5f278
Author: Aaron Wells <email address hidden>
Date: Mon Nov 30 18:24:44 2015 +1300
Revert bad merge changes in tinymce.jquery.js
Bug 1521058
behatnotneeded: Covered by existing tests
Change-Id: I7f4d2a29037507 4551f72ce2db731 b80cab5c278 ec37db09402e622 25a246a5ed)
(cherry picked from commit c687a52a1dde353