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

..

detect

Merge branch 'master' into feature/recog

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

memory

Update explib2.js

2014-04-02 23:07:29 -05:00

network

Oops. Need to init the profile before accessed.

2014-03-06 11:48:54 -06:00

utils

Change category name for base64

2013-10-18 21:20:16 -05:00