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

..

i18n

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

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

models

[MIG] note_pad : migration to new api

2016-05-03 16:59:20 +02:00

views

[MIG] note_pad : migration to new api

2016-05-03 16:59:20 +02:00

__init__.py

[MIG] note_pad : migration to new api

2016-05-03 16:59:20 +02:00

__openerp__.py

[MERGE] Forward-port saas-10 up to f76f4cd0b6

2016-07-01 20:14:28 +02:00