Skip to content

M
moodle_rebase10.1.2
Commit 6f92c092 authored by Cédric de Saint Martin's avatar Cédric de Saint Martin
Browse files
Options

Merge branch 'slaprunner_newcloud9' into slaprunner 

Conflicts:
	software/slaprunner/software.cfg
parents 5a6a7df4 fe0941da
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
software/slaprunner/software.cfg
View file @ 6f92c092
...@@ -155,7 +155,3 @@ zc.recipe.egg = 1.3.2 ...@@ -155,7 +155,3 @@ zc.recipe.egg = 1.3.2
# slapos.core==0.30 # slapos.core==0.30
zope.interface = 4.0.1 zope.interface = 4.0.1
pe.egg = 1.3.2 pe.egg = 1.3.2
# Required by:
# slapos.core==0.28.2
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7