Merge branch 'erp5' into cloudooo
Update with recently changes on erp5 branch. Conflicts: setup.py
Showing
This diff is collapsed.
component/xorg/tmp_env.patch
0 → 100644
software/agent/instance.cfg
0 → 100644
software/agent/software.cfg
0 → 100644
Please register or sign in to comment