Skip to content

C
cocoapods
Commit bf72fc87 authored by Fabio Pelosin's avatar Fabio Pelosin
Browse files
Options

Merge branch 'master' into 0.17 

* master:
  [Gemspec] Fix for Ruby 2.0.0-p0

Conflicts:
	cocoapods.gemspec
parents de97a067 34da3f79
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment