Matt Buck 2cd5be021b Merge branch 'master' into staging/rails-4.0 ...

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb
	metasploit-framework-db.gemspec
	metasploit-framework.gemspec

2015-01-08 13:12:27 -06:00

..

application.rb

Merge branch 'master' into staging/rails-4.0

2015-01-08 13:12:27 -06:00

boot.rb

Use bundler/setup for more graceful bundler related failures

2014-11-17 18:06:01 -08:00

cucumber.yml

updating how we use cucumber to match lukes changes

2014-09-02 18:57:55 -05:00

database.yml.example

Add some friendlier defaults to database.yml

2013-04-19 15:43:25 -05:00

database.yml.travis

Configure travis-ci to use database for rake spec

2013-03-15 08:48:20 -05:00

environment.rb

Use railties to load Metasploit::Credential correctly

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