Thibault Delavallée 4484a3197c [MERGE] Sync with trunk, resolved conflicts due to forward port of 7.0 ...

bzr revid: tde@openerp.com-20130315114338-54scb00rkp7zwr30

2013-03-15 12:43:38 +01:00

..

css

[MERGE] Sync with trunk, resolved conflicts due to forward port of 7.0

2013-03-15 12:43:38 +01:00

img

[IMP] mail: final touches on the attachments

2012-11-05 19:03:55 +01:00

js

[MERGE] Sync with trunk, resolved conflicts due to forward port of 7.0

2013-03-15 12:43:38 +01:00

xml

[MERGE] Sync with trunk, resolved conflicts due to forward port of 7.0

2013-03-15 12:43:38 +01:00