[MERGE] forward port of branch 8.0 up to 2e092ac
[odoo/odoo.git] / openerp / conf /
drwxr-xr-x   ..
-rw-r--r-- 1974 __init__.py
-rw-r--r-- 2602 deprecation.py