Commit Graph

3 Commits (520c82d7fc074adf73df35d3d4a5ca16e4084e2e)

Author SHA1 Message Date
Luke Imhoff b92e95ee7f
Add rubyzip 1.1.X
MSP-10004
2014-06-10 13:23:40 -05:00
Luke Imhoff 9e78509aac
Merge branch 'staging/electro-release' into feature/MSP-9653/use-metasploit-concern-in-pro
MSP-9653

Conflicts:
	Gemfile
	Gemfile.lock
2014-06-02 13:40:11 -05:00
Luke Imhoff 898b108863
Gemspec
MSP-9653

Add gemspec for metasploit-framework so that pro can declare it as a
proper dependency.  DO NOT release metasploit-framework to rubygems: it
is 47 MB and would be not be nice to their servers.
2014-06-02 13:03:07 -05:00