Commit 2733d547 authored by Jérome Perrin's avatar Jérome Perrin

Merge remote-tracking branch 'upstream/master' into zope4py2

parents 2daa1b89 bf810b79
......@@ -9,7 +9,6 @@
extensions +=
slapos.rebootstrap
slapos.extension.strip
slapos.extension.shared
show-picked-versions = true
......@@ -196,7 +195,6 @@ rubygemsrecipe = 0.4.3
six = 1.12.0
slapos.cookbook = 1.0.253
slapos.core = 1.7.13
slapos.extension.strip = 0.4
slapos.extension.shared = 1.0
slapos.libnetworkcache = 0.25
slapos.rebootstrap = 4.5
......
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