Christophe Simonis f9072c789d [MERGE] forward port of branch 9.0 up to bfbe2d6 ...

# Conflicts:
#	addons/marketing/i18n/es_PE.po
#	addons/marketing/i18n/hu.po

2016-06-14 19:27:16 +02:00

..

controllers

[MIG] website_google_map: new API migration

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

i18n

[MERGE] forward port of branch 9.0 up to bfbe2d6

2016-06-14 19:27:16 +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

[MIG] website_google_map: new API migration

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