aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/__init__.py
diff options
context:
space:
mode:
authorJisi Liu <liujisi@google.com>2018-01-04 14:26:24 -0800
committerGitHub <noreply@github.com>2018-01-04 14:26:24 -0800
commita3868af12be724f808faa21a29e7b4931e30bed1 (patch)
tree3df23c4174287023b569108eb133db0f9c310646 /python/google/protobuf/__init__.py
parenteca1d2a7113b3d57f900f69661342c0078c956c4 (diff)
parentec826c5a592126ddb6b12b47e6e1fb6232ce340d (diff)
downloadprotobuf-a3868af12be724f808faa21a29e7b4931e30bed1.tar.gz
protobuf-a3868af12be724f808faa21a29e7b4931e30bed1.tar.bz2
protobuf-a3868af12be724f808faa21a29e7b4931e30bed1.zip
Merge pull request #4131 from pherl/merge
Merge 3.5.x branch into master
Diffstat (limited to 'python/google/protobuf/__init__.py')
-rwxr-xr-xpython/google/protobuf/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
index 0f4d63b0..950f9b2d 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.5.0.post1'
+__version__ = '3.5.1'
if __name__ != '__main__':
try: