[MERGE] backport of trunk revisions:
[odoo/odoo.git] / addons / marketing_crm / models /
drwxr-xr-x   ..
-rw-r--r-- 43 __init__.py
-rw-r--r-- 750 res_config.py