Commit 89c45e7e authored by Cédric de Saint Martin's avatar Cédric de Saint Martin

Merge branch 'slapos'

parents 39f29783 27116534
......@@ -47,14 +47,14 @@ lxml = 2.3
meld3 = 0.6.7
netaddr = 0.7.5
setuptools = 0.6c12dev-r88846
slapos.core = 0.9
slapos.core = 0.10
slapos.libnetworkcache = 0.2
xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1
zc.recipe.egg = 1.3.2
# Required by:
# slapos.core==0.9
# slapos.core==0.10
Flask = 0.7.2
# Required by:
......@@ -62,13 +62,13 @@ Flask = 0.7.2
hexagonit.recipe.download = 1.5.0
# Required by:
# slapos.core==0.9
# slapos.core==0.10
netifaces = 0.5
# Required by:
# slapos.core==0.9
# slapos.core==0.10
supervisor = 3.0a10
# Required by:
# slapos.core==0.9
# slapos.core==0.10
zope.interface = 3.6.4
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