Christophe Simonis f9072c789d [MERGE] forward port of branch 9.0 up to bfbe2d6 ...

# Conflicts:
#	addons/marketing/i18n/es_PE.po
#	addons/marketing/i18n/hu.po

2016-06-14 19:27:16 +02:00

..

data

[MIG] utm:Migrated into new api.

2015-10-26 14:40:02 +01:00

i18n

[MERGE] forward port of branch 9.0 up to bfbe2d6

2016-06-14 19:27:16 +02:00

models

[FIX] utm: ignore utm for saleman.

2016-04-06 15:16:58 +02:00

security

…

views

[MIG] utm:Migrated into new api.

2015-10-26 14:40:02 +01:00

__init__.py

[ADD,MOVE] utm:Restructure file into new api.

2015-10-26 14:40:02 +01:00

__openerp__.py

[ADD,MOVE] utm:Restructure file into new api.

2015-10-26 14:40:02 +01:00