Commit af7d7839 by Alain Takoudjou

Merge branch 'master' into 1.0

2 parents 322415c1 b8d4cc97
......@@ -133,7 +133,7 @@ requests = 2.7.0
setuptools = 18.0.1
simplejson = 3.8.0
six = 1.9.0
slapos.cookbook = 0.103
slapos.cookbook = 1.0.9
slapos.core = 1.3.10
slapos.extension.strip = 0.1
slapos.libnetworkcache = 0.14.2
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!