Merge pull request #7497 from haberman/merge-312-branch

haberman · web-flow · commit 7913abc44908 · 2020-05-12T18:53:50.000-07:00
Merge 3.12.x branch to master after 3.12.0-rc2
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "google-protobuf",
-  "version": "3.11.4",
+  "version": "3.12.0-rc.2",
   "description": "Protocol Buffers for JavaScript",
   "main": "google-protobuf.js",
   "files": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "google-protobuf",`
`3`		`- "version": "3.11.4",`
	`3`	`+ "version": "3.12.0-rc.2",`
`4`	`4`	`"description": "Protocol Buffers for JavaScript",`
`5`	`5`	`"main": "google-protobuf.js",`
`6`	`6`	`"files": [`