diff options
author | Richard van der Hoff <richard@matrix.org> | 2020-02-11 11:12:31 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2020-02-11 11:12:31 +0000 |
commit | 88d41e94f5aeacdfdb415d9c50dcbc433f72945e (patch) | |
tree | 1b956a88660c888e70cb0442f0e4cdeb2bd42acd /synapse | |
parent | Merge branch 'release-v1.10.0' into develop (diff) | |
parent | 1.10.0rc5 (diff) | |
download | synapse-88d41e94f5aeacdfdb415d9c50dcbc433f72945e.tar.xz |
Merge branch 'release-v1.10.0' 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 cc69ff0c41..ba339004ba 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.10.0rc4" +__version__ = "1.10.0rc5" 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 |