diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-10 20:13:36 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-10 21:28:52 +0100 |
| commit | 32b3f67438cb2793021885b414ff4fe47639734b (patch) | |
| tree | 83742378a6a5db526bb1e78aee5ff9c413b92da2 /src | |
| parent | 203041148a9e2510b5cad6c038dc53bab0741ac2 (diff) | |
| parent | a8ba0c56158eca15cca58725a49a0ceb7e68e795 (diff) | |
Merge remote-tracking branch 'google/release-0_13' into merge-and-regen
Conflicts:
build.yaml
src/ruby/lib/grpc/version.rb
Diffstat (limited to 'src')
| -rw-r--r-- | src/ruby/lib/grpc/version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ruby/lib/grpc/version.rb b/src/ruby/lib/grpc/version.rb index 9cbd36a355..ef0876159d 100644 --- a/src/ruby/lib/grpc/version.rb +++ b/src/ruby/lib/grpc/version.rb @@ -29,5 +29,5 @@ # GRPC contains the General RPC module. module GRPC - VERSION = '0.14.0-dev' + VERSION = '0.14.0.dev' end |