Merge branch '3.18.x' into merge-release

haberman · haberman · commit 357af289ca75 · 2021-09-27T15:29:06.000-07:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "google-protobuf",
-  "version": "3.17.3",
+  "version": "3.18.0",
   "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.17.3",`
	`3`	`+ "version": "3.18.0",`
`4`	`4`	`"description": "Protocol Buffers for JavaScript",`
`5`	`5`	`"main": "google-protobuf.js",`
`6`	`6`	`"files": [`