[MERGE] Forward-port 7.0 up to 23cffab
[odoo/odoo.git] / addons / web / controllers / __init__.py
1 from . import main
2 from . import testing