diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-03-23 13:54:29 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-03-23 13:54:29 +0000 |
| commit | 5126cb1253d89ba196fcc828319bf195c866588a (patch) | |
| tree | 3810df923cfe63ddc569f583a32867e75f7279a7 /synapse | |
| parent | Fix processing of `groups` stream, and use symbolic names for streams (#7117) (diff) | |
| parent | Merge tag 'v1.12.0' (diff) | |
| download | synapse-5126cb1253d89ba196fcc828319bf195c866588a.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 020e0536be..5b86008945 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.12.0rc1" +__version__ = "1.12.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 |