James Lee a65ee6cf30 Land #3373, recog ...

Conflicts:
	Gemfile
	Gemfile.lock
	data/js/detect/os.js
	lib/msf/core/exploit/remote/browser_exploit_server.rb
	modules/exploits/android/browser/webview_addjavascriptinterface.rb

2014-10-03 18:05:58 -05:00

..

aix

Revert "Various merge resolutions from master <- staging"

2014-08-22 10:17:44 -05:00

cisco/gather

Redo the boilerplate / splat

2013-10-15 13:51:57 -05:00

firefox

Pass #send in this so jsobfu is not confused.

2014-09-24 15:07:14 -05:00

linux

Dropped a hyphen in the title

2014-09-16 12:47:44 -05:00

multi

Revert "Various merge resolutions from master <- staging"

2014-08-22 10:17:44 -05:00

osx

Merge branch staging/electro-release into master

2014-08-22 10:50:38 -05:00

solaris/gather

Catch mis-formatted bracket comments.

2013-10-15 14:52:12 -05:00

windows

Land #3373, recog

2014-10-03 18:05:58 -05:00