diff options
author | 2018-08-09 14:21:19 -0700 | |
---|---|---|
committer | 2018-08-09 14:21:19 -0700 | |
commit | 2580e1dbdcc9a26269aadca8495d9502b2313af4 (patch) | |
tree | a6a05dbb4cae63720747f835e5bb14822089ffb8 /src/csharp/Grpc.Core/Version.csproj.include | |
parent | 22f00acecbcd329c2706f0721533516b1772eccb (diff) | |
parent | cb87dd9fef97d1e1fb2559be68188c0792a3ecd8 (diff) |
Merge branch 'master' into transport-comments
Diffstat (limited to 'src/csharp/Grpc.Core/Version.csproj.include')
-rwxr-xr-x | src/csharp/Grpc.Core/Version.csproj.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.Core/Version.csproj.include b/src/csharp/Grpc.Core/Version.csproj.include index 1a746acdd4..6b0731eb40 100755 --- a/src/csharp/Grpc.Core/Version.csproj.include +++ b/src/csharp/Grpc.Core/Version.csproj.include @@ -2,6 +2,6 @@ <Project> <PropertyGroup> <GrpcCsharpVersion>1.15.0-dev</GrpcCsharpVersion> - <GoogleProtobufVersion>3.5.1</GoogleProtobufVersion> + <GoogleProtobufVersion>3.6.0</GoogleProtobufVersion> </PropertyGroup> </Project> |