Xavier Morel f4d78ae738 Merge branch 'server-trunk' ... Conflicts: addons/mass_mailing/controllers/main.py		2014-05-14 15:13:04 +02:00
..
controllers	[FIX] css edit menu alignment and fix of / handling	2014-05-11 17:40:58 +02:00
data	[IMP] clean sitemap, enumerate pages + fixes	2014-05-11 13:52:31 +02:00
models	Merge branch 'server-trunk'	2014-05-14 15:13:04 +02:00
security	[FIX] website: missing acl for manage website menu	2014-05-02 15:41:35 +02:00
static	[FIX] css edit menu alignment and fix of / handling	2014-05-11 17:40:58 +02:00
tests	[IMP] clean sitemap, enumerate pages + fixes	2014-05-11 13:52:31 +02:00
views	[ADD] website.menu editable list in website config	2014-05-12 13:38:20 +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