Christophe Simonis 1eaa69d342 [MERGE] forward port of branch saas-5 up to 9e8e365		2014-06-25 12:44:13 +02:00
..
controllers	[MERGE] forward port of branch saas-5 up to 9e8e365	2014-06-25 12:44:13 +02:00
data	[MERGE] sitemap backport, merge trunk from 9438 til 9440	2014-05-13 16:38:31 +02:00
models	[FIX] website: correct slug parsing	2014-06-25 11:08:51 +02:00
security	[FIX] website: missing acl for manage website menu	2014-05-02 15:41:35 +02:00
static	[MERGE] forward port of branch saas-5 up to 9e8e365	2014-06-25 12:44:13 +02:00
tests	[FIX] website: correct slug parsing	2014-06-25 11:08:51 +02:00
views	Merge pull request #584 from xmo-odoo/master-qweb-groups-xmo	2014-06-18 09:37:02 +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