diff options
author | 2015-07-26 12:37:53 -0700 | |
---|---|---|
committer | 2015-07-26 12:37:53 -0700 | |
commit | dfc42da76011eec3270b3dbcc94748916e0aa5b2 (patch) | |
tree | 5e1a69afefaaee7457ed1fa5796d00c06957757e /src/csharp/Grpc.IntegrationTesting/app.config | |
parent | b256faa353159c0b6f3477777bed75b4f9de3e16 (diff) | |
parent | 5c575dd6e4b01cd68cca5d1917b58023dcf4ca0f (diff) |
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Conflicts:
src/core/iomgr/tcp_server_windows.c
Diffstat (limited to 'src/csharp/Grpc.IntegrationTesting/app.config')
-rw-r--r-- | src/csharp/Grpc.IntegrationTesting/app.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.IntegrationTesting/app.config b/src/csharp/Grpc.IntegrationTesting/app.config index 966b777192..0a82bb4f16 100644 --- a/src/csharp/Grpc.IntegrationTesting/app.config +++ b/src/csharp/Grpc.IntegrationTesting/app.config @@ -4,7 +4,7 @@ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> <assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.2.28.0" newVersion="4.2.28.0" /> + <bindingRedirect oldVersion="0.0.0.0-4.2.29.0" newVersion="4.2.29.0" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> |