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