Merge branch 'master' into develop

This commit is contained in:
Erik Johnston 2020-10-30 16:27:02 +00:00
commit f27a789697
5 changed files with 17 additions and 3 deletions

View File

@ -1,3 +1,13 @@
Synapse 1.22.1 (2020-10-30)
===========================
Bugfixes
--------
- Fix a bug where an appservice may not be forwarded events for a room it was recently invited to. Broke in v1.22.0. ([\#8676](https://github.com/matrix-org/synapse/issues/8676))
- Fix `Object of type frozendict is not JSON serializable` exceptions when using third-party event rules. Broke in v1.22.0. ([\#8678](https://github.com/matrix-org/synapse/issues/8678))
Synapse 1.22.0 (2020-10-27) Synapse 1.22.0 (2020-10-27)
=========================== ===========================

View File

@ -1 +0,0 @@
Fix a bug where an appservice may not be forwarded events for a room it was recently invited to. Broken in v1.22.0.

View File

@ -1 +0,0 @@
Fix `Object of type frozendict is not JSON serializable` exceptions when using third-party event rules.

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
matrix-synapse-py3 (1.22.1) stable; urgency=medium
* New synapse release 1.22.1.
-- Synapse Packaging team <packages@matrix.org> Fri, 30 Oct 2020 15:25:37 +0000
matrix-synapse-py3 (1.22.0) stable; urgency=medium matrix-synapse-py3 (1.22.0) stable; urgency=medium
* New synapse release 1.22.0. * New synapse release 1.22.0.

View File

@ -48,7 +48,7 @@ try:
except ImportError: except ImportError:
pass pass
__version__ = "1.22.0" __version__ = "1.22.1"
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): 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 # We import here so that we don't have to install a bunch of deps when