diff options
| author | David Robertson <davidr@element.io> | 2022-03-21 12:29:53 +0000 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2022-03-21 12:29:53 +0000 |
| commit | 0a59f977a209f5d6698414c5bda1bb109f438127 (patch) | |
| tree | eb8daf9243d4a7e1b0f080a743d0f32ea1a7a415 | |
| parent | Make it possible to enable compression for the metrics HTTP resource (#12258) (diff) | |
| parent | Reword 'Choose your user name' as 'Choose your account name' in the SSO regis... (diff) | |
| download | synapse-0a59f977a209f5d6698414c5bda1bb109f438127.tar.xz | |
Merge branch 'release-v1.55' into develop
| -rw-r--r-- | changelog.d/12260.misc | 1 | ||||
| -rw-r--r-- | synapse/res/templates/sso_auth_account_details.html | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/12260.misc b/changelog.d/12260.misc new file mode 100644 |