Merge remote-tracking branch 'upstream/erp5-generic' into deployment_generic_CR1094
Conflicts: setup.py software/erp5/software.cfg
Showing
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
slapos/recipe/publish.py
0 → 100644
File moved
Please register or sign in to comment