Commit cccc2ae4 authored by Marco Mariani's avatar Marco Mariani

Merge branch 'proxy_instance_guid' of https://git.erp5.org/repos/slapos.core...

Merge branch 'proxy_instance_guid' of https://git.erp5.org/repos/slapos.core into proxy_instance_guid
parents 9fe16347 9870e43c
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment