[MERGE] Merge with trunk upto revision no 1184.

[odoo/odoo.git] / addons / web / __openerp__.py

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 0afd431..d304825 100644 (file)
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -42,6 +42,7 @@
         "static/src/js/view_list.js",
         "static/src/js/view_list_editable.js",
         "static/src/js/view_tree.js",
+        "static/src/js/view_editor.js"
     ],
     'css' : [
         "static/lib/jquery.superfish/css/superfish.css",