diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2021-11-30 14:28:30 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2021-11-30 14:28:30 +0000 |
| commit | b14f8a1baf6f500997ae4c1d6a6d72094ce14270 (patch) | |
| tree | a8fa755541f7e462247b1f72803dad7c8fe46028 /synapse | |
| parent | Add missing copyright header. (#11460) (diff) | |
| parent | Merge trust_identity_server_for_password_resets PRs (diff) | |
| download | synapse-b14f8a1baf6f500997ae4c1d6a6d72094ce14270.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 48ac38aec6..3cd1ce6070 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.47.1" +__version__ = "1.48.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 |