diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-05-28 15:52:30 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-05-28 15:52:30 +0200 |
| commit | 731d190fecb1976d845f6bd18768ee528b007232 (patch) | |
| tree | 323c63555256ad7e5faa6a9d3c10f957295d0ce1 /program/js/tiny_mce/plugins/template/blank.htm | |
| parent | 586ed69aa8f9df34076f4e3bb5e1ecf0cfc6581a (diff) | |
| parent | 8763170d224408bb01998d0a3393d2eacfc781ad (diff) | |
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
Diffstat (limited to 'program/js/tiny_mce/plugins/template/blank.htm')
| -rw-r--r-- | program/js/tiny_mce/plugins/template/blank.htm | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/program/js/tiny_mce/plugins/template/blank.htm b/program/js/tiny_mce/plugins/template/blank.htm deleted file mode 100644 index ecde53fae..000000000 --- a/program/js/tiny_mce/plugins/template/blank.htm +++ /dev/null @@ -1,12 +0,0 @@ -<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>blank_page</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <script type="text/javascript">
- parent.TemplateDialog.loadCSSFiles(document);
- </script>
-</head>
-<body id="mceTemplatePreview" class="mceContentBody">
-
-</body>
-</html>
|