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 9.0 up to e0c0a5f

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

i18n

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

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

static/src

[MIG] website_google_map: new API migration

2015-10-08 11:01:56 +02:00

views

[MIG] website_google_map: new API migration

2015-10-08 11:01:56 +02:00

__init__.py

[MIG] website_google_map: new API migration

2015-10-08 11:01:56 +02:00

__openerp__.py

[MERGE] Forward-port 9.0 up to 7f2e748a22

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