Merge branch 'rapid7' into bug/rm7037-hash-iteration

bug/bundler_fix
James Lee 2012-11-07 19:45:08 -06:00
commit 5670d2266b
2 changed files with 5 additions and 1 deletions

4
.travis.yml Normal file
View File

@ -0,0 +1,4 @@
language: ruby
rvm:
- '1.8.7'
- '1.9.3'

View File

@ -1,5 +1,5 @@
Metasploit [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/rapid7/metasploit-framework)
Metasploit [![Build Status](https://travis-ci.org/rapid7/metasploit-framework.png)](https://travis-ci.org/rapid7/metasploit-framework) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/rapid7/metasploit-framework)
==
The Metasploit Framework is released under a BSD-style license. See
COPYING for more details.