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

1 files changed, 0 insertions, 8 deletions

diff --git a/program/js/tiny_mce/plugins/advlink/css/advlink.css b/program/js/tiny_mce/plugins/advlink/css/advlink.css
deleted file mode 100644
index 14364316a..000000000
--- a/program/js/tiny_mce/plugins/advlink/css/advlink.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.mceLinkList, .mceAnchorList, #targetlist {width:280px;}

-.mceActionPanel {margin-top:7px;}

-.panel_wrapper div.current {height:320px;}

-#classlist, #title, #href {width:280px;}

-#popupurl, #popupname {width:200px;}

-#popupwidth, #popupheight, #popupleft, #popuptop {width:30px;vertical-align:middle;text-align:center;}

-#id, #style, #classes, #target, #dir, #hreflang, #lang, #charset, #type, #rel, #rev, #tabindex, #accesskey {width:200px;}

-#events_panel input {width:200px;}