Merge branch 'erp5-generic' into wprtubackup
Conflicts: setup.py slapos/recipe/librecipe/genericslap.py slapos/recipe/publish.py slapos/recipe/request.py slapos/recipe/softwaretype.py
Showing
This diff is collapsed.
This diff is collapsed.
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
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.
Please register or sign in to comment