From f55779fd831029f764c885bf1fd026a7e94f08eb Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 Mar 2012 20:47:31 -0700 Subject: update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks --- .../tiny_mce/plugins/table/merge_cells.htm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm (limited to 'library/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm') diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm b/library/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm old mode 100755 new mode 100644 index 9736ed8c0..d231090e7 --- a/library/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm +++ b/library/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm @@ -7,20 +7,20 @@ - +

{#table_dlg.cols}:
{#table_dlg.rows}: