[MERGE] merged trunk.
[odoo/odoo.git] / addons / mail / static /
drwxr-xr-x   ..
drwxr-xr-x - scripts