Skip to content
Snippets Groups Projects
Commit c52e5597 authored by Nicolas "Pixel" Noble's avatar Nicolas "Pixel" Noble
Browse files

Merge branch 'release-0_13' into upmerge

Conflicts:
	Makefile
	build.yaml
	package.json
	src/core/lib/surface/version.c
	src/csharp/Grpc.Core/VersionInfo.cs
	src/csharp/build_packages.bat
	src/python/grpcio/grpc_version.py
	src/ruby/lib/grpc/version.rb
	tools/doxygen/Doxyfile.c++
	tools/doxygen/Doxyfile.c++.internal
	tools/doxygen/Doxyfile.core
	tools/doxygen/Doxyfile.core.internal
parents a5dc80d2 85ed15d3
No related branches found
No related tags found
No related merge requests found
Showing
No files found.
with 0 additions and 0 deletions
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment