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

egypt · egypt · commit 5670d2266bd2 · 2012-11-07T19:45:08.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - '1.8.7'
+  - '1.9.3'
diff --git a/README.md b/README.md
@@ -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.

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +language: ruby
 +rvm:
 +  - '1.8.7'
 +  - '1.9.3'