diff options
author | Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:19 -0800 |
---|---|---|
committer | Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:19 -0800 |
commit | 0ba8eea655a5e40d19ab95c773192b5d908c5a61 (patch) | |
tree | 4c2c97ade1ab197d361c146bacae5adde55986bf /python/google/protobuf/__init__.py | |
parent | 92a7e778e7394386f413cec28d67a07630f784b1 (diff) | |
parent | a711e3d5b4ee1dd7f9d21197dca8432a5819a64e (diff) |
Merge branch 'master' into down-integrate
Diffstat (limited to 'python/google/protobuf/__init__.py')
-rwxr-xr-x | python/google/protobuf/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 9f1a4f19..0f4d63b0 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -30,7 +30,7 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '3.4.1' +__version__ = '3.5.0.post1' if __name__ != '__main__': try: |