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
..
persistent_storage	Doc tag changes based on feedback.	2013-12-26 10:14:41 -08:00
serializer	Add show missing	2014-09-12 10:23:12 -05:00
sessions	Land #3373, recog	2014-10-03 18:05:58 -05:00
simple	Merge branch staging/electro-release into master	2014-08-22 10:50:38 -05:00
config.rb	Revert "Various merge resolutions from master <- staging"	2014-08-22 10:17:44 -05:00
logging.rb	Doc tag changes based on feedback.	2013-12-26 10:14:41 -08:00
persistent_storage.rb	Doc tag changes based on feedback.	2013-12-26 10:14:41 -08:00
simple.rb	Mark all libraries as defaulting to 8-bit strings	2012-06-29 00:18:28 -05:00