Joshua Haberman 32a94ce353 Merge tag 'refs/tags/sync-piper' into sync-stage ... # Conflicts: # csharp/src/Google.Protobuf.Test/testprotos.pb		2020-08-17 15:26:33 -07:00
..
protobuf	Merge tag 'refs/tags/sync-piper' into sync-stage	2020-08-17 15:26:33 -07:00
__init__.py	Set execute bit on files if and only if they begin with (#!). (#7347)	2020-04-01 15:28:25 -07:00