[MERGE]: merging from the same branch
[odoo/odoo.git] / addons / marketing /
drwxr-xr-x   ..
-rw-r--r-- 1080 __init__.py
-rw-r--r-- 1494 __openerp__.py
-rw-r--r-- 2697 marketing_view.xml
-rw-r--r-- 1929 marketing_wizard.py
drwxr-xr-x - security