[MERGE] merge from trunk addons
[odoo/odoo.git] / addons / association /
drwxr-xr-x   ..
-rwxr-xr-x 1081 __init__.py
-rwxr-xr-x 1457 __openerp__.py
drwxr-xr-x - i18n
-rwxr-xr-x 2314 profile_association.py
-rwxr-xr-x 3262 profile_association.xml
drwxr-xr-x - security