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

..

CTFd

Fix flags.json and link hrefs.

2019-03-21 12:09:16 -05:00

auditbeat_goal_rules.erb

auto_grading huge merge (2)

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

elastalert_goal_rules.erb

auto_grading huge merge (2)

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

Puppetfile

Major overhaul of code base!

2016-06-09 00:03:04 +01:00

Puppetfile.erb

Merge branch 'auto_grading071220' into auto_grading180621

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

Vagrantfile

Major overhaul of code base!

2016-06-09 00:03:04 +01:00

Vagrantfile.erb

auto_grading huge merge (2)

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