Christophe Simonis 1f22653d19 [MERGE] saas-6 forward-port ...

Rebasing a merge commit with a lot of conflicts is a real pain as every
non-automatic conflicts should be redo manually (especially when there
is a lot of file rename that git cannot follow)

2015-05-28 14:31:46 +02:00

..

controllers

[MIG] bus, im_chat, im_livechat, website_livechat : migration to new API.

2015-04-28 17:04:16 +02:00

data

[MIG] bus, im_chat, im_livechat, website_livechat : migration to new API.

2015-04-28 17:04:16 +02:00

i18n

[I18N] Update translations from Launchpad 8.0 branches

2015-02-18 11:51:07 +01:00

models

[MERGE] forward port of branch saas-6 up to bf1e999

2015-05-28 14:27:38 +02:00

report

[MIG] bus, im_chat, im_livechat, website_livechat : migration to new API.

2015-04-28 17:04:16 +02:00

security

[MIG] bus, im_chat, im_livechat, website_livechat : migration to new API.

2015-04-28 17:04:16 +02:00

static

[MERGE] forward port of branch saas-6 up to bf1e999

2015-05-28 14:27:38 +02:00

views

[IMP] Reorganize menuitem into coherent block instead of ordering

2015-05-27 15:24:14 +02:00

__init__.py

[MIG] im_chat, im_livechat : re structure the modules files.

2015-04-28 17:04:16 +02:00

__openerp__.py

[MIG] im_chat, im_livechat : re structure the modules files.

2015-04-28 17:04:16 +02:00