summaryrefslogtreecommitdiff
path: root/addons/website/models/__init__.py
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2013-10-14 10:54:59 +0200
committerXavier Morel <xmo@openerp.com>2013-10-14 10:54:59 +0200
commit2e352ce187d2685df64ebd36f669a8abd88d5f65 (patch)
tree529af9c967929ca13896e8464abdc8fe9d02710c /addons/website/models/__init__.py
parent3e349a2bf7c76f5136935b531c5b3fb65833e8be (diff)
parent063a698313e522596a0f784206a9d17b9f31dafa (diff)
[MERGE] from trunk
bzr revid: xmo@openerp.com-20131014085459-dhbypq0hg3lzzf3j
Diffstat (limited to 'addons/website/models/__init__.py')
-rw-r--r--addons/website/models/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/website/models/__init__.py b/addons/website/models/__init__.py
index af592ba012c..23f91ffe9f6 100644
--- a/addons/website/models/__init__.py
+++ b/addons/website/models/__init__.py
@@ -1,7 +1,9 @@
# -*- coding: utf-8 -*-
-import view
+import ir_fields
+import ir_ui_view
import website
+import ir_rule
import ir_qweb
import test_models