Jjk422 8365d2cca6 Merge branch 'master-forensics-new' into master-main-forensic-merge ...

# Conflicts:
#	Gemfile
#	lib/templates/Vagrantfile.erb
#	secgen.rb

2017-12-15 14:09:01 +00:00

..

project_files_creator.rb

secgen.rb: adding --network-ranges

2017-09-21 15:44:23 +01:00

xml_marker_generator.rb

hint improvements

2017-06-24 00:19:52 +01:00

xml_scenario_generator.rb

Chrome Internet history module

2017-04-16 17:55:02 +01:00