diff options
| author | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2020-07-30 15:18:36 +0100 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2020-07-30 15:18:36 +0100 |
| commit | 3aa36b782c715a2d3c965d5d9b37f7a49a5f17e1 (patch) | |
| tree | 16ab78763c83a0b7b5157f0fe0dca6b4135fd47c /synapse/__init__.py | |
| parent | Convert federation client to async/await. (#7975) (diff) | |
| parent | Fix formatting of changelog and upgrade notes (diff) | |
| download | synapse-3aa36b782c715a2d3c965d5d9b37f7a49a5f17e1.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/__init__.py')
| -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 72c93f6c48..f70381bc71 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.18.0rc2" +__version__ = "1.18.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 |