Skip to content
Snippets Groups Projects
Commit 46e85b02 authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3 

Conflicts:
	src/csharp/Grpc.Core/VersionInfo.cs
	src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs
	src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
	src/csharp/Grpc.IntegrationTesting/InteropClient.cs
	src/csharp/Grpc.IntegrationTesting/packages.config
	src/csharp/build_packages.bat
parents 58d63744 58d7310f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 247 additions and 59 deletions
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