Commit 3c667bc3 authored by Marco Mariani's avatar Marco Mariani

Merge branch 'resiliency_annotated' of https://git.erp5.org/repos/slapos into resiliency_annotated

parents 7c9148fe 8c5e3a8d
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