Commit 714fb296 authored by Łukasz Nowak's avatar Łukasz Nowak

Merge branch 'slapos'

parents 2067bf91 2cdb7de6
......@@ -127,14 +127,14 @@ ipython = 0.13
lxml = 2.3.5
meld3 = 0.6.8
netaddr = 0.7.7
slapos.core = 0.28.3
slapos.core = 0.28.4
slapos.libnetworkcache = 0.12
xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1
zc.recipe.egg = 1.3.2
# Required by:
# slapos.core==0.28.3
# slapos.core==0.28.4
Flask = 0.9
# Required by:
......@@ -146,11 +146,11 @@ Sphinx = 1.1.3
hexagonit.recipe.download = 1.5.1
# Required by:
# slapos.core==0.28.3
# slapos.core==0.28.4
netifaces = 0.8
# Required by:
# slapos.core==0.28.3
# slapos.core==0.28.4
# slapos.libnetworkcache==0.12
# supervisor==3.0a12
# zc.buildout==1.6.0-dev-SlapOS-006
......@@ -158,9 +158,9 @@ netifaces = 0.8
setuptools = 0.6c12dev-r88846
# Required by:
# slapos.core==0.28.3
# slapos.core==0.28.4
supervisor = 3.0a12
# Required by:
# slapos.core==0.28.3
# slapos.core==0.28.4
zope.interface = 4.0.1
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