ts 9d664ad677 Merge branch 'post_tests' into s2progress ...

# Conflicts:
#	modules/generators/structured_content/hackerbot_config/hbauthentication/secgen_metadata.xml
#	modules/generators/structured_content/hackerbot_config/hbauthentication/templates/intro.md.erb
#	modules/generators/structured_content/hackerbot_config/hbauthentication/templates/lab.xml.erb
#	modules/vulnerabilities/unix/access_control_misconfigurations/suid_root_bash/suid_root_bash.pp
#	modules/vulnerabilities/unix/access_control_misconfigurations/suid_root_vi/suid_root_vi.pp
#	modules/vulnerabilities/unix/web_training/dvwa/files/DVWA-master/vulnerabilities/csp/help/help.php
#	modules/vulnerabilities/unix/web_training/dvwa/manifests/apache.pp
#	scenarios/ctf/basic_narrative.xml
#	scenarios/labs/websec_lab_env.xml
#	scenarios/security_audit/team_project.xml

2019-02-15 18:18:30 +00:00

..

basic_narrative.xml

Merge branch 'post_tests' into s2progress

2019-02-15 18:18:30 +00:00

encoding_challenges.xml

challenge 4 correction

2018-11-21 11:54:04 +00:00

flawed_fortress_1.xml

additional metadata for scenarios

2018-07-10 23:39:57 +01:00

metactf_reversing_challenges.xml

MetaCTF: random challenge ctf scenario

2018-11-16 10:19:10 +00:00

nw_cyber_games.xml

scenario updates

2019-02-01 20:21:29 +00:00