diff options
author | murgatroid99 <mlumish@google.com> | 2015-10-05 10:18:05 -0700 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2015-10-05 10:18:05 -0700 |
commit | b0f3bf16cee1d893fc0414fcfe1060baac4eaa9b (patch) | |
tree | 747298bf60f8a0b1c519a33d6084fad42fc192de /src/cpp/README.md | |
parent | 350835a9566a4b56bfd409108ec235ef2424b630 (diff) | |
parent | a9154a36fbc019b87f4d62ce16b346f3d44ec2de (diff) |
Resolved merge conflicts with master
Diffstat (limited to 'src/cpp/README.md')
-rw-r--r-- | src/cpp/README.md | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cpp/README.md b/src/cpp/README.md index a2eb9a08c8..baeba08315 100644 --- a/src/cpp/README.md +++ b/src/cpp/README.md @@ -5,5 +5,4 @@ This directory contains source code for C++ implementation of gRPC. #Status -Alpha : Ready for early adopters - +Beta |