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

This commit is contained in:
Samuel Huckins
2014-07-29 20:50:05 -05:00
3 changed files with 2 additions and 2 deletions
-2
View File
@@ -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