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

…

i18n

[MERGE] forward port of branch 9.0 up to bfbe2d6

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

models

[MERGE] forward port of branch 9.0 up to de11d84

2016-04-01 18:43:35 +02:00

security

…

static/src

…

views

[FIX] Misc livechat fixes: bugfix in search view, history accessible, better form view

2015-12-11 02:53:15 +01:00

__init__.py

…

__openerp__.py

…