setup.py · 7ad9487a83539d13fcbaccf605e3b0180280fd2d · Coopdevs / Odoo / Coopdevs OCB mirror · GitLab

Snippets Groups Projects

8 years ago
f9072c78
[MERGE] forward port of branch 9.0 up to bfbe2d6e · f9072c78
Christophe Simonis authored 8 years ago
```
# Conflicts:
#	addons/marketing/i18n/es_PE.po
#	addons/marketing/i18n/hu.po
```
f9072c78

History
[MERGE] forward port of branch 9.0 up to bfbe2d6e
Christophe Simonis authored 8 years ago
```
# Conflicts:
#	addons/marketing/i18n/es_PE.po
#	addons/marketing/i18n/hu.po
```