Mark Taylor 40f1e59a97 Fixed merge conflicts

2015-08-02 16:40:10 +01:00

..

ApiConnection.cs

refactoring ApiConnection.EmptyBody to RequestBody.Empty to break the inverse dependency from Connection to ApiConnection

2015-08-01 00:16:51 -05:00

ApiInfo.cs

…

ApiInfoExtensions.cs

…

ApiInfoParser.cs

…

ApiResponse.cs

…

Connection.cs

Removed IApiInfoProvider from IHttpClient

2015-07-31 12:12:46 +02:00

Credentials.cs

…

CredentialsExtensions.cs

…

HttpClientAdapter.cs

Removed IApiInfoProvider from IHttpClient

2015-07-31 12:12:46 +02:00

HttpMessageHandlerFactory.cs

…

HttpVerb.cs

…

IApiConnection.cs

…

IApiInfoProvider.cs

Renamed IApiInfo -> IApiInfoProvider

2015-07-31 12:08:16 +02:00

IConnection.cs

Renamed IApiInfo -> IApiInfoProvider

2015-07-31 12:08:16 +02:00

ICredentialStore.cs

…

IHttpClient.cs

Removed IApiInfoProvider from IHttpClient

2015-07-31 12:12:46 +02:00

IJsonSerializer.cs

…

InMemoryCredentialStore.cs

…

IRequest.cs

…

IResponse.cs

…

JsonHttpPipeline.cs

…

ProductHeaderValue.cs

…

RateLimit.cs

Additional changes following review

2015-07-27 14:07:15 +01:00

ReadOnlyPagedCollection.cs

…

Request.cs

…

RequestBody.cs

refactoring ApiConnection.EmptyBody to RequestBody.Empty to break the inverse dependency from Connection to ApiConnection

2015-08-01 00:16:51 -05:00

Response.cs

Fixed failing tests

2015-07-31 12:23:13 +02:00

SimpleJsonSerializer.cs

…