diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-07-08 11:25:34 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-07-08 11:25:34 +0100 |
| commit | 59ddcd790b76e0b86774c1c3b63ef1cd5d968ae1 (patch) | |
| tree | 047c6c84bc2b7aae934ce01be292d5e47e9266fe | |
| parent | Change Caddy links (old is deprecated) (#7789) (diff) | |
| parent | shuffle changelog slightly (diff) | |
| download | synapse-59ddcd790b76e0b86774c1c3b63ef1cd5d968ae1.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGES.md | 15 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 17 insertions, 6 deletions
diff --git a/CHANGES.md b/CHANGES.md index ff924604cb..3a0fe606f8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,13 @@ +Synapse 1.16.0 (2020-07-08) +=========================== + +No significant changes since 1.16.0rc2. + +Note that this release deprecates the `m.login.jwt` login method, renaming it +to `org.matrix.login.jwt`, as `m.login.jwt` is not part of the Matrix spec. +Otherwise the behaviour is identical. Synapse will accept both names for now, +but this may change in a future release. + Synapse 1.16.0rc2 (2020-07-02) ============================== @@ -39,11 +49,6 @@ Security advisory Synapse 1.16.0rc1 (2020-07-01) ============================== -Note that this release deprecates the `m.login.jwt` login method, renaming it -to `org.matrix.login.jwt`, as `m.login.jwt` is not part of the Matrix spec. -Otherwise the behaviour is identical. Synapse will accept both names for now, -but this may change in a future release. - Features -------- diff --git a/debian/changelog b/debian/changelog index c068510b93..1e7d7191ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.16.0) stable; urgency=medium + + * New synapse release 1.16.0. + + -- Synapse Packaging team <packages@matrix.org> Wed, 08 Jul 2020 11:03:48 +0100 + matrix-synapse-py3 (1.15.2) stable; urgency=medium * New synapse release 1.15.2. diff --git a/synapse/__init__.py b/synapse/__init__.py index 0ffbcae502..de65ce6db8 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.16.0rc2" +__version__ = "1.16.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 |