Christophe Simonis 47c4728f43 [FIX] mail,website_sale: rename file_type to file_type_icon to avoid name conflict with file_type field added by document module ... bzr revid: chs@openerp.com-20140228142233-i0mm9lav0czbydkk		2014-02-28 15:22:33 +01:00
..
css	[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9846 revid:dle@openerp.com-20140217124044-o8sgz1esfqeha01f	2014-02-17 13:42:30 +01:00
img	[CLEAN] Cleaning befor merging	2013-07-23 11:55:09 +02:00
js	[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9133 dle@openerp.com-20140214131810-9abebxpfeoga1crn	2014-02-17 10:12:03 +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