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
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
Please register or sign in to comment