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

..

factories/mdm

Retab all the things (except external/)

2013-09-30 13:47:53 -05:00

file_fixtures

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

lib

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

models/metasploit/credential

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

support

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

tools

Put classes under a module

2014-01-12 15:54:56 -06:00

msfcli_spec.rb

Remove to_s inside #{}

2014-01-23 14:21:48 -06:00

msfupdate_spec.rb

Allow stubbing stdin in msfupdate

2013-11-15 17:15:15 -06:00

spec_helper.rb

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00