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

..

i18n

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

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

models

[MIG] auth_crypt: migrate into new api

2015-12-17 11:38:28 +01:00

__init__.py

[MIG] auth_crypt: migrate into new api

2015-12-17 11:38:28 +01:00

__openerp__.py

[MERGE] Forward-port 9.0 up to 7f2e748a22

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