Fabien Meghazi 7c934d3969 [MERGE] upstream ... bzr revid: xmo@openerp.com-20131115105349-0b1bifqe3v9159w2 bzr revid: fme@openerp.com-20131118124023-68c4armtmlx2dybz		2013-11-18 13:40:23 +01:00
..
css	[MERGE] forward port of branch 7.0 up to revid 4067 chs@openerp.com-20131114142639-ng7wzfjwvvel2nhv	2013-11-15 11:49:09 +01:00
font	[IMP] clean permissions and shebang in files	2013-05-14 12:37:36 +02:00
img	[MERGE] forward port of branch 7.0 up to revid 3973 chs@openerp.com-20130611145028-f98x6inytlr3ijjg	2013-06-11 17:52:51 +02:00
js	[MERGE] upstream	2013-11-18 13:40:23 +01:00
xml	[FIX] Changed the url of the openerp logo to tarket /web instead of /.	2013-11-07 11:44:43 +01:00