[MERGE]: merging from the same branch
[odoo/odoo.git] / addons / analytic /
drwxr-xr-x   ..
-rw-r--r-- 1071 __init__.py
-rw-r--r-- 1502 __openerp__.py
-rw-r--r-- 16913 project.py
drwxr-xr-x - security