diff options
author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-16 00:57:57 +0200 |
---|---|---|
committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-08-16 01:54:33 +0200 |
commit | e1ee20bde6c30f0aa5a6f5309d20971ccd0122a7 (patch) | |
tree | 5d89668ab96d6d1e3f5274480d9f75a6a76f5be4 /package.json | |
parent | 8d46873e8f2e675e7f41d16861b531ffe3e62103 (diff) | |
parent | e4947befe26c8f33ab05dace34c2988ac394de59 (diff) |
Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index 0e229c9842..9afba31816 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "devDependencies": { "async": "^1.5.0", "google-auth-library": "^0.9.2", - "google-protobuf": "^3.0.0-alpha.5", + "google-protobuf": "^3.0.0", "istanbul": "^0.3.21", "jsdoc": "^3.3.2", "jshint": "^2.5.0", |