diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-14 19:27:16 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-14 19:27:16 +0200 |
| commit | f9072c789d85e8c97e68325c02b46686f52d5bc3 (patch) | |
| tree | 8f0773df41de3e97459fc07c36e836ae3c84373c /doc/tutorials.rst | |
| parent | 89f424dd2819966581894ade2ff6d71d4906ba7e (diff) | |
| parent | bfbe2d6e6d181da3877acebfee1a701cbd6493fc (diff) | |
[MERGE] forward port of branch 9.0 up to bfbe2d6
# Conflicts:
# addons/marketing/i18n/es_PE.po
# addons/marketing/i18n/hu.po
Diffstat (limited to 'doc/tutorials.rst')
0 files changed, 0 insertions, 0 deletions