summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-10-30 15:24:48 +0000
committerErik Johnston <erik@matrix.org>2020-10-30 15:24:48 +0000
commit1b831f2bec8331bcadd12996c310c8ec0355bf42 (patch)
treeb3a6f47aa67d22ef28e9902cf302a27be35447cc
parentImprove the sample config for SSO (OIDC, SAML, and CAS). (#8635) (diff)
parentMerge pull request #8678 from matrix-org/rav/fix_frozen_events (diff)
downloadsynapse-1b831f2bec8331bcadd12996c310c8ec0355bf42.tar.xz
Merge branch 'release-v1.22.1' into develop
0 files changed, 0 insertions, 0 deletions