Commit 3bf1cfc3 authored by Fabio Pelosin's avatar Fabio Pelosin

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

* 'develop' of github.com:CocoaPods/CocoaPods:
  Rubinius on Travis does not seem to pickup the UTF8 default external encoding.
  No need to run `pod setup` manually. Closes #315.
parents c15a1f09 5b94145c
......@@ -6,4 +6,4 @@ rvm:
#- rbx-18mode
- rbx-19mode
install: NOEXEC=skip rake travis:setup
script: bundle exec rake spec
script: RUBYOPT=-Ku bundle exec rake spec
......@@ -25,9 +25,6 @@ Gem::Specification.new do |s|
s.executables = %w{ pod }
s.require_paths = %w{ lib }
s.post_install_message = "[!] If this is your first time install of CocoaPods, or if " \
"you are upgrading, first run: $ pod setup"
s.add_runtime_dependency 'faraday', '~> 0.8.1'
s.add_runtime_dependency 'octokit', '~> 1.3.0'
......
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