Merge branch 'upstream_master'
Conflicts: software/erp5/software.cfg Resolved by accepting upstream version.
Showing
00.Repository.Rules.txt
0 → 100644
slapos/recipe/mysql/mysql.py
0 → 100644
software/kumofs/instance.cfg
0 → 100644
software/kumofs/software.cfg
0 → 100644
software/vifib/software.cfg
0 → 100644
stack/cloudooo.cfg
0 → 100644
Please register or sign in to comment