Martin Trigaux f0c8224175 [FIX] update saas-11 translations by merging 9.0 and master ...

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

2016-08-26 15:19:04 +02:00

..

controllers

[MERGE] forward port branch saas-10 up to 7a4116c

2016-08-26 14:57:43 +02:00

doc

[MERGE] forward port of branch saas-10 up to d73f0d8

2016-06-21 13:58:24 +02:00

i18n

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

2016-08-26 15:19:04 +02:00

static

[MERGE] forward port branch saas-10 up to bc1a0a3

2016-08-20 16:57:36 +02:00

tests

…

views

[MERGE] forward port branch saas-10 up to bc1a0a3

2016-08-20 16:57:36 +02:00

__init__.py

…

__openerp__.py

[REF] web: stop duplicating web

2016-04-21 15:21:39 +02:00

bower.json

…

Gruntfile.js

[REF] web: stop duplicating web

2016-04-21 15:21:39 +02:00

package.json

…