Joshua Haberman 9952e36f92 Merge release branch into master. (#7517) ... * Added background information about proto3 presence. (#7501) * Fixed bug in map key sorting for Java TextFormat. (#7508) Fixes: https://github.com/protocolbuffers/protobuf/issues/7505 * Update protobuf version * Added a changelog entry about the Java fix. (#7516)		2020-05-16 16:42:02 -07:00
..
csharp	Remove wording indicating proto2 support is reimplemented	2019-09-03 04:24:46 -05:00
field_presence.md	Typo in 'disciplines' (#7423)	2020-04-27 08:21:52 -07:00
implementing_proto3_presence.md	Merge release branch into master. (#7517)	2020-05-16 16:42:02 -07:00
options.md	Allocated option number 1086 for ADLINK EdgeSDK	2020-04-02 09:07:16 -07:00
performance.md	Update performance.md	2019-05-21 03:18:36 -04:00
third_party.md	docs: add python-betterproto	2020-04-16 09:22:52 -07:00