[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam
[odoo/odoo.git] / doc / _templates /
drwxr-xr-x   ..
-rw-r--r-- 647 sidebarintro.html
-rw-r--r-- 139 sidebarlogo.html