diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-07-13 11:42:52 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-07-13 11:42:52 +0100 |
| commit | 59e64b6d5b25734a07f5deb7e4996578b67d7273 (patch) | |
| tree | 4cc73241dd547bcf02e6cfeb45928054b403ce95 /synapse | |
| parent | Do not use canonicaljson to magically handle decoding bytes from JSON. (#7802) (diff) | |
| parent | 1.17.0 (diff) | |
| download | synapse-59e64b6d5b25734a07f5deb7e4996578b67d7273.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 5bb09a37d7..8592dee179 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.17.0rc1" +__version__ = "1.17.0" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when |