Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

qfq
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

5451626c

Commit 5451626c authored 8 years ago by Carsten Rose

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/tinymce' into crose_work

parents f95594a8 20a24f19

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

javascript/src/Helper/tinyMCE.js 1 addition, 1 deletion

javascript/src/Helper/tinyMCE.js
javascript/src/Utils.js 19 additions, 0 deletions

javascript/src/Utils.js
mockup/richtexteditor.html 2 additions, 2 deletions

mockup/richtexteditor.html

with 22 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment