diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2021-01-27 11:13:21 -0500 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2021-01-27 11:13:21 -0500 |
| commit | 17b713850f2de134512bd8fff87c74c07d88d719 (patch) | |
| tree | 67e0260892717005dd68a380407b1ffa2363bfc9 /synapse | |
| parent | Clean-up the template loading code. (#9200) (diff) | |
| parent | Move note above changes. (diff) | |
| download | synapse-17b713850f2de134512bd8fff87c74c07d88d719.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 3cd682f9e7..93601dbad0 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.26.0rc2" +__version__ = "1.26.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 |