[MERGE] Merge from trunk-wms-loconopreport-jco
[odoo/odoo.git] / addons / website_google_map / __init__.py
1 import controllers
2 import models