Merge branch 'master' into vagrant

2016-02-20 09:10:17 -07:00
parent 392d10a099 b868f7cc89
commit a65a4929f7
441 changed files with 3671 additions and 3030 deletions
@@ -68,6 +68,8 @@ external/source/exploits/**/Release
 # Avoid checking in Meterpreter binaries. These are supplied upstream by
 # the metasploit-payloads gem.
 data/meterpreter/*.dll
+data/meterpreter/*.php
+data/meterpreter/*.py
 data/meterpreter/*.bin
 data/meterpreter/*.jar
 data/meterpreter/*.lso