Christophe Simonis dda0d3d62d [MERGE] forward port of branch saas-10 up to baf494c ...

# Conflicts:
#	addons/hr_timesheet/project_timesheet.py
#	addons/sale_layout/i18n/es_PE.po
#	addons/sale_layout/i18n/hu.po
#	addons/sale_layout/i18n/lo.po
#	addons/sale_layout/i18n/pl.po
#	addons/sale_service/i18n/es_MX.po
#	addons/sale_service/i18n/es_PE.po
#	addons/sale_service/i18n/lo.po
#	addons/stock/stock.py
#	addons/stock/stock_view.xml
#	addons/warning/i18n/es_PE.po
#	addons/warning/i18n/lo.po
#	addons/warning/i18n/ru.po
#	addons/web/i18n/cs.po
#	addons/web/i18n/ja.po
#	addons/web/i18n/lo.po
#	addons/web/i18n/th.po

2016-06-15 12:59:39 +02:00

..

__init__.py

[MOV] mail, im_chat : move files and code from im_chat to mail and bus

2015-09-01 20:16:08 +02:00

bus.py

[IMP] mail: merge chat initial RPCs

2015-12-28 10:05:15 +01:00

main.py

[MERGE] forward port of branch saas-10 up to baf494c

2016-06-15 12:59:39 +02:00