[MERGE]:resolved conflicts and merged with trunk
[odoo/odoo.git] / addons / project_long_term / test /
drwxr-xr-x   ..
-rw-r--r-- 2770 phase_process.yml
-rw-r--r-- 737 task_process.yml