David Maloney aeda74f394 Merge branch 'master' into staging/electro-release ...

Conflicts:
	Gemfile
	Gemfile.lock

2014-07-07 16:41:23 -05:00

..

base/simple

Retab all the things (except external/)

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

core

Merge branch 'master' into staging/electro-release

2014-07-07 16:41:23 -05:00

db_manager

Use railties to load Metasploit::Credential correctly

2014-05-12 15:03:51 -05:00

ui/command_dispatcher

fix more broken specs

2014-06-19 14:07:39 -05:00

util

Remove blanket pending test for exe_spec

2013-11-11 16:27:42 -06:00

db_manager_spec.rb

Remove should_receive(:with_connection) from specs

2014-06-19 16:24:53 -05:00