Fabien Meghazi 593cdf427f Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme		2014-05-21 10:29:04 +02:00
..
controllers	[MERGE] forward port of branch saas-4 up to revid bb26dea	2014-05-20 20:19:55 +02:00
data	[MERGE] sitemap backport, merge trunk from 9438 til 9440	2014-05-13 16:38:31 +02:00
models	[MERGE] forward port of branch saas-4 up to revid bb26dea	2014-05-20 20:19:55 +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-4 up to revid bb26dea	2014-05-20 20:19:55 +02:00
tests	[MERGE] forward port of branch saas-4 up to revid bb26dea	2014-05-20 20:19:55 +02:00
views	Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme	2014-05-21 10:29:04 +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