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

..

i18n

[MERGE] forward port of branch 9.0 up to bfbe2d6

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

security

…

static

[MERGE] forward port of branch 9.0 up to ff3184e

2016-02-04 14:41:55 +01:00

views

…

__init__.py

…

__openerp__.py

…

restaurant_demo.xml

…

restaurant_view.xml

[MERGE] forward port of branch 9.0 up to 928bc26

2016-06-02 15:12:47 +02:00

restaurant.py

[MERGE] Forward-port saas-6 up to 2d4deca055

2016-04-14 10:39:09 +02:00