HD Moore 43d65cc93a Merge branch 'master' into feature/recog ...

Resolves conflicts:
	Gemfile
	data/js/detect/os.js
	modules/exploits/android/browser/webview_addjavascriptinterface.rb

2014-07-06 09:17:44 -05:00

..

browser_exploit_server.rb

Merge branch 'master' into feature/recog

2014-07-06 09:17:44 -05:00

firefox_addon_generator.rb

Restructure some of the exploit methods.

2014-02-19 02:31:22 -06:00

firefox_privilege_escalation.rb

Remove a number of stray edits and bs.

2014-06-06 16:24:45 -05:00