summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2021-01-25 08:51:45 -0500
committerPatrick Cloke <patrickc@matrix.org>2021-01-25 08:51:45 -0500
commite448dbbf5b488be28a9bf6d86ebd90fa2eee5e39 (patch)
tree3a5c6994277a1a7d897f0cf626f2c63418e8b04d /synapse/__init__.py
parentHandle missing content keys when calculating presentable names. (#9165) (diff)
parentTweak changes. (diff)
downloadsynapse-e448dbbf5b488be28a9bf6d86ebd90fa2eee5e39.tar.xz
Merge tag 'v1.26.0rc2' into develop
Synapse 1.26.0rc2 (2021-01-25)
==============================

Bugfixes
--------

- Fix receipts and account data not being sent down sync. Introduced in v1.26.0rc1. ([\#9193](https://github.com/matrix-org/synapse/issues/9193), [\#9195](https://github.com/matrix-org/synapse/issues/9195))
- Fix chain cover update to handle events with duplicate auth events. Introduced in v1.26.0rc1. ([\#9210](https://github.com/matrix-org/synapse/issues/9210))

Internal Changes
----------------

- Add an `oidc-` prefix to any `idp_id`s which are given in the `oidc_providers` configuration. ([\#9189](https://github.com/matrix-org/synapse/issues/9189))
- Bump minimum `psycopg2` version to v2.8. ([\#9204](https://github.com/matrix-org/synapse/issues/9204))
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d423856d82..3cd682f9e7 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.26.0rc1"
+__version__ = "1.26.0rc2"
 
 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