diff options
| author |  Adam Cozzette <acozzette@google.com> | 2016-11-17 17:04:30 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2016-11-17 17:04:30 -0800 |
| commit | 5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd (patch) | |
| tree | 50d8116271f024e16334785464c794da85f3ce12 /js/package.json | |
| parent | 5a76e633ea9b5adb215e93fdc11e1c0c08b3fc74 (diff) | |
| parent | cd315dcbadc02569e145bde16e3f66c2fbb08e31 (diff) | |
Merge branch 'master' into down-integrate-with-msvc-fix
Diffstat (limited to 'js/package.json')
| -rw-r--r-- | js/package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/package.json b/js/package.json index ee4181ff..d3c77eb6 100644 --- a/js/package.json +++ b/js/package.json @@ -22,5 +22,5 @@ "url": "https://github.com/google/protobuf/tree/master/js" }, "author": "Google Protocol Buffers Team", - "license": "Apache-2.0" + "license" : "BSD-3-Clause" } |