diff options
| author | Adam Cozzette <acozzette@google.com> | 2018-08-01 13:44:55 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2018-08-01 13:44:55 -0700 |
| commit | 94d55e529204cc8575bf1070dc1e2375dbc8a4c5 (patch) | |
| tree | 20730e597f914fd2430c66b9bebe633e017a4fe0 /python | |
| parent | 3d62db3ecd5377025a458bca827ab4ca12d5c1f0 (diff) | |
| parent | 48cb18e5c419ddd23d9badcfe4e9df7bde1979b2 (diff) | |
| download | protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.tar.gz protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.tar.bz2 protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.zip | |
Merge branch '3.6.x' into merge-3-6-x
Diffstat (limited to 'python')
| -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 58a3f040..249e18aa 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.6.0' +__version__ = '3.6.1' if __name__ != '__main__': try: |