Merge branch 'master' of https://github.com/odoo/odoo
[odoo/odoo.git] / addons / website_membership / __init__.py
1 import controllers
2 import models