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