Commit ef2bbcda authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge remote-tracking branch 'origin/master' into erp5-component

parents a12d8a16 f3e105f6
......@@ -135,7 +135,7 @@ netaddr = 0.7.11
prettytable = 0.7.3-nxd001
pyparsing = 2.0.1
six = 1.6.1
slapos.core = 1.0.3
slapos.core = 1.0.4
slapos.libnetworkcache = 0.14.1
slapos.recipe.cmmi = 0.2
stevedore = 0.15
......
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