Merge branch 'grpc-1.6' into 'master'

Use grpc 1.6.0

See merge request gitlab-org/gitlab-ce!14262
This commit is contained in:
Robert Speicher 2017-09-15 18:43:28 +00:00
commit 3dd2248605
1 changed files with 1 additions and 1 deletions

View File

@ -357,7 +357,7 @@ GEM
rake
grape_logging (1.7.0)
grape
grpc (1.4.5)
grpc (1.6.0)
google-protobuf (~> 3.1)
googleauth (~> 0.5.1)
haml (4.0.7)