Christophe Simonis b8089a1521 [MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1 ... bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am		2014-05-07 19:01:12 +02:00
..
controllers	[REM] preprocess_request from website	2014-05-05 18:38:41 +02:00
data	[MERGE] from trunk	2014-04-10 17:29:25 +02:00
models	[MERGE] trunk-websit-al-refactor by chm	2014-05-07 17:32:23 +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 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1	2014-05-07 19:01:12 +02:00
tests	[MERGE] from trunk	2014-04-11 10:20:50 +02:00
views	[FIX] jQuery.ui - boostrap conflict	2014-05-06 17:33:35 +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