Skip to content

Commit

Permalink
Merge pull request #866 from plone/erral-update-tinymce
Browse files Browse the repository at this point in the history
Update TinyMCE to version 4.7.13
  • Loading branch information
sunew authored Sep 14, 2018
2 parents 9bc4bc5 + 7861923 commit 036f5f6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ Breaking changes:

New features:

- Include TinyMCE 4.7.13
[erral]

- pat-structure: Use the datatables pattern for sorting columns
[frapell]

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"requirejs-text": "2.0.15",
"select2": "3.5.4",
"selectivizr": "1.0.2",
"tinymce-builded": "4.7.6",
"tinymce-builded": "4.7.13",
"js-shortcuts": "^1.0.1",
"cs-jqtree-contextmenu": "^0.1.0"
},
Expand Down

0 comments on commit 036f5f6

Please sign in to comment.