diff options
author | Erik Johnston <erik@matrix.org> | 2021-07-29 16:29:17 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-07-29 16:29:17 +0100 |
commit | 65f520697da2df74afac24c4beb08eddba8342b3 (patch) | |
tree | 34c0df9e866f85271fc33ce4710c83f76d6b2f73 | |
parent | Improve failover logic for MSC3083 restricted rooms. (#10447) (diff) | |
parent | Merge tag 'v1.39.0' (diff) | |
download | synapse-65f520697da2df74afac24c4beb08eddba8342b3.tar.xz |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | CHANGES.md | 11 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 14 insertions, 5 deletions
diff --git a/CHANGES.md b/CHANGES.md index b512d9ff3f..6533249281 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,9 @@ +Synapse 1.39.0 (2021-07-29) +=========================== + +No significant changes. + + Synapse 1.39.0rc3 (2021-07-28) ============================== @@ -19,10 +25,7 @@ Internal Changes Synapse 1.39.0rc2 (2021-07-22) ============================== -Bugfixes --------- - -- Always include `device_one_time_keys_count` key in `/sync` response to work around a bug in Element Android that broke encryption for new devices. ([\#10457](https://github.com/matrix-org/synapse/issues/10457)) +This release also includes the changes in v1.38.1. Internal Changes diff --git a/debian/changelog b/debian/changelog index ff21599df1..341c1ac992 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,12 @@ matrix-synapse-py3 (1.39.0ubuntu1) UNRELEASED; urgency=medium -- Richard van der Hoff <richard@matrix.org> Tue, 20 Jul 2021 00:10:03 +0100 +matrix-synapse-py3 (1.39.0) stable; urgency=medium + + * New synapse release 1.39.0. + + -- Synapse Packaging team <packages@matrix.org> Thu, 29 Jul 2021 09:59:00 +0100 + matrix-synapse-py3 (1.39.0~rc3) stable; urgency=medium * New synapse release 1.39.0~rc3. diff --git a/synapse/__init__.py b/synapse/__init__.py index c9a445c8fe..5da6c924fc 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.39.0rc3" +__version__ = "1.39.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 |