diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-04-02 16:24:38 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-04-02 16:24:38 +0100 |
| commit | 61bb834364d1353ab349258653df12a3feda5790 (patch) | |
| tree | c30dce46d6c7c8059dfd81ef26376855b460956f /demo | |
| parent | Support SAML in the user interactive authentication workflow. (#7102) (diff) | |
| parent | Merge tag 'v1.12.1' (diff) | |
| download | synapse-61bb834364d1353ab349258653df12a3feda5790.tar.xz | |
Merge branch 'master' into develop
* master: 1.12.1 Note where bugs were introduced 1.12.1rc1 Newsfile Rewrite changelog Add changelog Only import sqlite3 when type checking Fix another instance Only setdefault for signatures if device has key_json Fix starting workers when federation sending not split out. Attempt to clarify Python version requirements (#7161) Improve the UX of the login fallback when using SSO (#7152) Update the wording of the config comment Lint Changelog Regenerate sample config Whitelist the login fallback by default for SSO
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions