aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/__init__.py
diff options
context:
space:
mode:
authorJisi Liu <liujisi@google.com>2018-05-15 15:20:51 -0700
committerGitHub <noreply@github.com>2018-05-15 15:20:51 -0700
commit15cde292ce085bec0d089db2e1e2d3403e765d21 (patch)
treed3b06c5a55b482ee53731b165ddf418bfe21dbe4 /python/google/protobuf/__init__.py
parentb61dd9d9a229c5a82788fdeefa344aa65affae09 (diff)
parent45eb28b588a3b4ef5e54abf92b1f2b7eafb2cbf8 (diff)
downloadprotobuf-15cde292ce085bec0d089db2e1e2d3403e765d21.tar.gz
protobuf-15cde292ce085bec0d089db2e1e2d3403e765d21.tar.bz2
protobuf-15cde292ce085bec0d089db2e1e2d3403e765d21.zip
Merge pull request #4625 from liujisi/3.6.x
Update version number to 3.6.0
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 d4360727..58a3f040 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.2'
+__version__ = '3.6.0'
if __name__ != '__main__':
try: