diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-29 15:52:39 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-29 15:52:39 +0000 |
| commit | 74c1e16106fca0ec9126c3e218cd7763330c5cb0 (patch) | |
| tree | b6c8f4148e647e0f11f7125f140954d023ed84d6 /synapse | |
| parent | Make concurrently_execute work with async/await (diff) | |
| parent | Fix CI for synapse_port_db (#6276) (diff) | |
| download | synapse-74c1e16106fca0ec9126c3e218cd7763330c5cb0.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/federation_server_async_await
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 d0f92ffbf3..8587ffa76f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.5.0rc2" +__version__ = "1.5.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 |