[MERGE] merged feature branch of hr_payroll project
[odoo/odoo.git] / addons / base /
drwxr-xr-x   ..
-rw-r--r-- 19 __init__.py
-rw-r--r-- 100 __openerp__.py
drwxr-xr-x - controllers
drwxr-xr-x - static
drwxr-xr-x - test