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

..

i18n

[MERGE] forward port of branch 9.0 up to bfbe2d6

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

static

…

views

…

__init__.py

…

__openerp__.py

[REF] theme_(default,bootswatch)

2016-01-04 15:49:14 +01:00