thomashaw a45ea10342 Merge branch 'auto_grading071220' into auto_grading180621 ...

# Conflicts:
#	lib/batch/batch_secgen.rb
#	lib/readers/system_reader.rb
#	lib/schemas/scenario_schema.xsd
#	lib/templates/Puppetfile.erb
#	modules/generators/structured_content/metactf_challenge/secgen_metadata.xml
#	modules/utilities/unix/ctf/metactf/manifests/configure.pp
#	modules/utilities/unix/ctf/metactf/manifests/install.pp

2021-06-18 10:13:07 +01:00

..

puppet

ASE 5: wip

2021-03-03 21:27:00 +00:00

unix

auto_grading huge merge (2)

2020-12-07 12:39:10 +00:00