Commit 14518bd5 authored by Romain Courteaud's avatar Romain Courteaud

Merge branch 'vincent'

Conflicts:
	slapos/format.py
parents 7a4cc0dc 7a476f87
This diff is collapsed.
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