[MERGE] forward port of branch 7.0 up to 65d92da
[odoo/odoo.git] / addons / website_sale / __init__.py
1 import controllers
2 import models