Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k ... bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow		2014-03-24 14:38:11 +01:00
..
css	[MERGE] Sync with trunk	2014-02-21 11:23:22 +01:00
img	[CLEAN] Cleaning befor merging	2013-07-23 11:55:09 +02:00
js	[MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k	2014-03-24 14:38:11 +01:00
xml	[FIX] mail,website_sale: rename file_type to file_type_icon to avoid name conflict with file_type field added by document module	2014-02-28 15:22:33 +01:00