3 Commits (19ba7772f30b4104930443862deb8f435dac27db)

Author	SHA1	Message	Date
Brandon Turner	19ba7772f3	Revert "Various merge resolutions from master <- staging" ... This reverts commit 149c3ecc63. Conflicts: lib/metasploit/framework/command/base.rb lib/metasploit/framework/common_engine.rb lib/metasploit/framework/require.rb lib/msf/core/modules/namespace.rb modules/auxiliary/analyze/jtr_postgres_fast.rb modules/auxiliary/scanner/smb/smb_login.rb msfconsole	2014-08-22 10:17:44 -05:00
Samuel Huckins	149c3ecc63	Various merge resolutions from master <- staging ... * --ask option ported to new location * --version option now works * MSF version updated * All specs passing	2014-08-15 11:33:31 -05:00
Tod Beardsley	6f37ea2aeb	Adding a 3rd party zip library (rubyzip by Thomas Sondergaard and Technorama Ltd, released under the Ruby license), and a method to import ZIP reports generated by Metasploit Express (still needs work, but is mildly functional right now). ... git-svn-id: file:///home/svn/framework3/trunk@9478 4d416f70-5f16-0410-b530-b9f4589650da	2010-06-10 21:06:06 +00:00