Merge remote-tracking branch 'google/release-0_14' into master-sync

Browse Source

Conflicts:
	Makefile
	build.yaml
	composer.json
	package.json
	package.xml
	src/core/lib/surface/version.c
	src/csharp/Grpc.Core/VersionInfo.cs
	src/csharp/build_packages.bat
	src/node/tools/package.json
	src/python/grpcio/grpc_version.py
	src/ruby/lib/grpc/version.rb
	src/ruby/tools/version.rb
	tools/distrib/python/grpcio_tools/grpc_version.py
	tools/doxygen/Doxyfile.c++
	tools/doxygen/Doxyfile.c++.internal
	tools/doxygen/Doxyfile.core
	tools/doxygen/Doxyfile.core.internal

pull/6508/head

Nicolas "Pixel" Noble 9 years ago

parent fac1b4d220 0b917a7375

commit 2d1c3bdd12

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available