[MERGE] Merge psi branch : lp:~psi-tinyerp/openobject-addons/trunk-mode3-yaml:
[odoo/odoo.git] / addons / resource /
drwxr-xr-x   ..
-rw-r--r-- 1086 __init__.py
-rw-r--r-- 1914 __openerp__.py
drwxr-xr-x - faces
-rw-r--r-- 11090 resource.py
-rw-r--r-- 3479 resource_demo.xml
-rw-r--r-- 10967 resource_view.xml
drwxr-xr-x - security