Christophe Simonis c202dc1c52 merge upstream ... bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn		2014-01-29 20:08:34 +01:00
..
audio	[FIX] im: notification sound change	2014-01-06 15:58:35 +01:00
css	[REF] Adjust positionning from icon IM (temp while fontawsome replace it)	2014-01-28 01:37:23 +01:00
img	[IMP] move html module description and icon	2013-06-28 12:04:41 +02:00
js	[MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah	2014-01-29 19:47:03 +01:00
xml	[FIX][ADD] im, im_livechat: fix security rules and add history when opening a conversation	2014-01-28 17:26:49 +01:00