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

..

controllers

[MERGE] forward port branch 9.0 up to e0c0a5f

2016-07-29 12:04:24 +02:00

i18n

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

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

static/src

…

views

…

__init__.py

…

__openerp__.py

[MERGE] Forward-port 9.0 up to 7f2e748a22

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