diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-29 15:53:17 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-29 15:53:17 +0000 |
| commit | 38474707b99b2425a085a3d96eb5f0d1c4622568 (patch) | |
| tree | 0616acc724adf124d1220b9307d5518d5169d803 /synapse | |
| parent | Newsfile (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/federation... (diff) | |
| download | synapse-38474707b99b2425a085a3d96eb5f0d1c4622568.tar.xz | |
Merge branch 'erikj/federation_server_async_await' of github.com:matrix-org/synapse into erikj/receipts_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 |