diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-04-03 11:29:43 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-04-03 11:29:43 +0100 |
| commit | 6dd6a3557c3ac0d515145ba0b5ab3a4b24bb4c03 (patch) | |
| tree | 01b0b3bf33e8a964df23b63a49547e2e8c664bff /synapse | |
| parent | Fix device list update stream ids going backward (#7158) (diff) | |
| parent | Revert "Revert "Merge pull request #7153 from matrix-org/babolivier/sso_white... (diff) | |
| download | synapse-6dd6a3557c3ac0d515145ba0b5ab3a4b24bb4c03.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 5df7d51ab1..3bf2d02450 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.12.1" +__version__ = "1.12.3" 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 |