Merge branch 'master' into vifib
Conflicts: CHANGES.txt setup.py software/erp5/software.cfg software/erp5testnode/software.cfg
Showing
00.Repository.Rules.txt
0 → 100644
software/kumofs/instance.cfg
0 → 100644
software/kumofs/software.cfg
0 → 100644
stack/cloudooo.cfg
0 → 100644
stack/flask.cfg
0 → 100644
Please register or sign in to comment