Merge branch 'staging/electro-release' of github.com:shuckins-r7/metasploit-framework into staging/electro-release

2014-07-29 20:50:05 -05:00
parent 0876302fba 8f950f39be
commit be18dddac7
3 changed files with 2 additions and 2 deletions
@@ -7,8 +7,6 @@ Gemfile.local.lock
 .sublime-project
 # RVM control file, keep this to avoid backdooring Metasploit
 .rvmrc
-.ruby-version
-.ruby-gemset
 # YARD cache directory
 .yardoc
 # Mac OS X files
@@ -0,0 +1 @@
+metasploit-framework
@@ -0,0 +1 @@
+1.9.3-p484