Martin Trigaux 9bbdec5dc9 [FIX] update saas-10 translations by merging 9.0 and master ...

using the --uses-first parameter on msgmerge this time

2016-08-29 15:35:58 +02:00

..

data

[FIX] product_email_template: remove outdated demo data

2016-01-25 14:28:57 +05:30

i18n

[FIX] update saas-10 translations by merging 9.0 and master

2016-08-29 15:35:58 +02:00

models

[REF] product_email_template: migration to the new API

2016-01-25 14:28:57 +05:30

static/img

…

views

[MERGE] forward port of branch saas-9 up to 78d20b5

2016-01-27 12:27:01 +01:00

__init__.py

…

__openerp__.py

[MERGE] Forward-port 9.0 up to 7f2e748a22

2016-07-01 18:36:24 +02:00