Xavier Morel 46712acaec [FIX] bunch of changes lost in incorrect merge f4d78ae738

2014-05-30 17:00:52 +02:00

..

controllers

[FIX] website: fix incomplete refactoring

2014-05-30 15:35:59 +02:00

data

[MERGE] sitemap backport, merge trunk from 9438 til 9440

2014-05-13 16:38:31 +02:00

models

[FIX] bunch of changes lost in incorrect merge f4d78ae738

2014-05-30 17:00:52 +02:00

security

[FIX] website: missing acl for manage website menu

2014-05-02 15:41:35 +02:00

static

[MERGE] Forward-port of latest saas-4 fixes, up to 0452851

2014-05-27 20:49:49 +02:00

tests

[MERGE] forward port of branch saas-4 up to revid bb26dea

2014-05-20 20:19:55 +02:00

views

[MERGE] Forward-port of latest saas-4 fixes, up to 0452851

2014-05-27 20:49:49 +02:00

__init__.py

[FIX] website tests

2014-02-17 01:11:48 +01:00

__openerp__.py

[MERGE] from trunk

2014-05-02 11:51:32 +02:00