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

..

lib/jquery.expander

[MOV] mail expander library: moved into mail/static/lib to closely match OpenERP guidelines.

2012-07-02 17:26:28 +02:00

scripts

[MERGE] trunk

2012-10-02 12:29:15 +02:00

src

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

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