Skip to content
Snippets Groups Projects
  • Andrew Morgan's avatar
    61bb8343
    Merge branch 'master' into develop · 61bb8343
    Andrew Morgan authored
    * 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
    61bb8343
    History
    Merge branch 'master' into develop
    Andrew Morgan authored
    * 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