Skip to content

Commit

Permalink
Merge release branch into master. (#7517)
Browse files Browse the repository at this point in the history
* Added background information about proto3 presence. (#7501)

* Fixed bug in map key sorting for Java TextFormat. (#7508)

Fixes: protocolbuffers/protobuf#7505

* Update protobuf version

* Added a changelog entry about the Java fix. (#7516)
  • Loading branch information
haberman committed May 16, 2020
1 parent 9869f3e commit 723960a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "google-protobuf",
"version": "3.12.0-rc.2",
"version": "3.12.0",
"description": "Protocol Buffers for JavaScript",
"main": "google-protobuf.js",
"files": [
Expand Down

0 comments on commit 723960a

Please sign in to comment.