summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-04-02 16:24:38 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-04-02 16:24:38 +0100
commit61bb834364d1353ab349258653df12a3feda5790 (patch)
treec30dce46d6c7c8059dfd81ef26376855b460956f /changelog.d
parentSupport SAML in the user interactive authentication workflow. (#7102) (diff)
parentMerge tag 'v1.12.1' (diff)
downloadsynapse-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 'changelog.d')
0 files changed, 0 insertions, 0 deletions