aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorAdam Cozzette <acozzette@google.com>2018-08-01 13:44:55 -0700
committerAdam Cozzette <acozzette@google.com>2018-08-01 13:44:55 -0700
commit94d55e529204cc8575bf1070dc1e2375dbc8a4c5 (patch)
tree20730e597f914fd2430c66b9bebe633e017a4fe0 /js
parent3d62db3ecd5377025a458bca827ab4ca12d5c1f0 (diff)
parent48cb18e5c419ddd23d9badcfe4e9df7bde1979b2 (diff)
downloadprotobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.tar.gz
protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.tar.bz2
protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.zip
Merge branch '3.6.x' into merge-3-6-x
Diffstat (limited to 'js')
-rw-r--r--js/package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/package.json b/js/package.json
index 325f2dcc..c24d9510 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
{
"name": "google-protobuf",
- "version": "3.6.0",
+ "version": "3.6.1",
"description": "Protocol Buffers for JavaScript",
"main": "google-protobuf.js",
"files": [