Jjk422 d64ea06f4d Merge branch 'master-forensics' into master-forensics-new ...

# Conflicts:
#	Gemfile
#	Gemfile.lock

2017-04-13 17:01:16 +01:00

..

project_files_creator.rb

Merge branch 'packer_build_from_iso' into master-forensics-new

2017-04-13 16:05:55 +01:00

xml_marker_generator.rb

marker.xml for marking CTF flags and providing hints (which have IDs so we don't have to give the same hint twice), also updated organisation of scenarios

2017-03-14 17:30:33 +00:00

xml_scenario_generator.rb

Merge branch 'master-forensics' into master-forensics-new

2017-04-13 17:01:16 +01:00