Revert "Merge branch 'grpc-1.3.4' into 'master'"

This reverts merge request !11645
This commit is contained in:
Jacob Vosmaer (GitLab) 2017-05-31 08:09:07 +00:00
parent 8039b9c3c6
commit cdb1030031
1 changed files with 1 additions and 1 deletions

View File

@ -341,7 +341,7 @@ GEM
grape-entity (0.6.0) grape-entity (0.6.0)
activesupport activesupport
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
grpc (1.3.4) grpc (1.2.5)
google-protobuf (~> 3.1) google-protobuf (~> 3.1)
googleauth (~> 0.5.1) googleauth (~> 0.5.1)
haml (4.0.7) haml (4.0.7)