John Nunemaker a936eaab93 Merge branch 'openssl-ciphers2' of https://github.com/where/httparty into where-openssl-ciphers2 ... Conflicts: spec/httparty/connection_adapter_spec.rb		2013-01-02 16:11:11 -05:00
..
fixtures	Update signed certs for longer lasting expiration	2010-10-20 09:49:15 -04:00
httparty	Merge branch 'openssl-ciphers2' of https://github.com/where/httparty into where-openssl-ciphers2	2013-01-02 16:11:11 -05:00
support	Merge branch 'master' of github.com:isaacsanders/httparty	2012-04-16 09:19:57 -05:00
httparty_spec.rb	Merge branch 'openssl-ciphers2' of https://github.com/where/httparty into where-openssl-ciphers2	2013-01-02 16:11:11 -05:00
spec.opts	Switch to normal rspec output.	2012-04-16 09:13:06 -05:00
spec_helper.rb	Merge branch 'ssl_version' of https://github.com/htanata/httparty into htanata-ssl_version	2012-09-07 12:36:01 -04:00