Skip to content

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

Merge branch 'develop' of github.com:CocoaPods/CocoaPods into develop 

* 'develop' of github.com:CocoaPods/CocoaPods:
  [Rakefile] Release from develop branch.

Conflicts:
	Rakefile
parents 26fb824f 1e503497
Show 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