f4d78ae738
Conflicts: addons/mass_mailing/controllers/main.py |
||
---|---|---|
.. | ||
controllers | ||
data | ||
doc | ||
models | ||
security | ||
static | ||
tests | ||
views | ||
wizard | ||
__init__.py | ||
__openerp__.py |
f4d78ae738
Conflicts: addons/mass_mailing/controllers/main.py |
||
---|---|---|
.. | ||
controllers | ||
data | ||
doc | ||
models | ||
security | ||
static | ||
tests | ||
views | ||
wizard | ||
__init__.py | ||
__openerp__.py |