diff options
| author | Richard Mathot (OpenERP) <rim@openerp.com> | 2013-12-18 13:48:33 +0100 |
|---|---|---|
| committer | Richard Mathot (OpenERP) <rim@openerp.com> | 2013-12-18 13:48:33 +0100 |
| commit | 3bfbcfee360e39b83d07bc38d2a331ae2cfe70a0 (patch) | |
| tree | 7fe90117fb495a6fc54cebf859270cc417fdb177 /addons/website/static/src/js/website.editor.js | |
| parent | b5de38f2875759230e7f46997761ea442ccbbd97 (diff) | |
| parent | 90a9e522f3190a314fca289066943f312cd637f3 (diff) | |
[MERGE] Merge parents
bzr revid: rim@openerp.com-20131218072037-7g2t677f1fryj9tt
bzr revid: rim@openerp.com-20131218124833-07mgsnr35oibusn1
Diffstat (limited to 'addons/website/static/src/js/website.editor.js')
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 1e3ef0da66a..c7c5620c9a4 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -859,7 +859,7 @@ var plugins = [ 'a11yhelp', 'basicstyles', 'blockquote', 'clipboard', 'colorbutton', 'colordialog', 'dialogadvtab', - 'elementspath', 'enterkey', 'entities', 'filebrowser', + 'elementspath', /*'enterkey',*/ 'entities', 'filebrowser', 'find', 'floatingspace','format', 'htmlwriter', 'iframe', 'indentblock', 'indentlist', 'justify', 'list', 'pastefromword', 'pastetext', 'preview', |