Christophe Matthieu 5165b52b43 merge upstream		2014-06-19 18:46:49 +02:00
..
controllers	[FIX] sitemap does not show pages	2014-06-17 13:43:57 +02:00
data	[MERGE] sitemap backport, merge trunk from 9438 til 9440	2014-05-13 16:38:31 +02:00
models	[FIX] website: missing timezone conversion back to UTC	2014-06-18 16:09:02 +02:00
security	[FIX] website: missing acl for manage website menu	2014-05-02 15:41:35 +02:00
static	merge upstream	2014-06-19 18:46:49 +02:00
tests	[IMP] Tour: add tour in web module; tour became available in backend.	2014-06-18 12:25:13 +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