HomePhorge

Merge branch 'tinymce4'

Description

Merge branch 'tinymce4'

Conflicts:
program/js/app.js
program/js/editor.js
program/js/tiny_mce/tiny_mce.js
program/steps/utils/spell_html.inc

Details

Provenance
machniakAuthored on May 28 2014, 1:52 PM
mollekopfPushed on Aug 21 2023, 3:06 PM
Parents
R3:8763170d2244: TinyMCE4: small improvements
R3:586ed69aa8f9: Add method to make a treelist widget become a jQuery UI droppable with support…
Branches
Unknown
Tags
Unknown

Event Timeline

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.