Permalink
Browse files

Merge branch 'typhoeus_compatibility' of git://github.com/Cyril-sf/ko…

…ala into Cyril-sf-typhoeus_compatibility
  • Loading branch information...
2 parents 95c1c8a + 24f9d4a commit dbb09b3aea1a36d9eb603804f93e578222b37334 @arsduo committed Jan 19, 2013
Showing with 2 additions and 1 deletion.
  1. +2 −1 lib/koala/http_service.rb
View
3 lib/koala/http_service.rb
@@ -1,4 +1,5 @@
require 'faraday'
+require 'typhoeus/adapters/faraday'
require 'koala/http_service/multipart_request'
require 'koala/http_service/uploadable_io'
require 'koala/http_service/response'
@@ -218,4 +219,4 @@ def self.deprecated_interface
Faraday.default_adapter = :net_http
end
end
-end
+end

0 comments on commit dbb09b3

Please sign in to comment.