diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2021-11-30 14:28:30 +0000 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2021-11-30 14:28:30 +0000 |
commit | b14f8a1baf6f500997ae4c1d6a6d72094ce14270 (patch) | |
tree | a8fa755541f7e462247b1f72803dad7c8fe46028 /changelog.d/11429.docker | |
parent | Add missing copyright header. (#11460) (diff) | |
parent | Merge trust_identity_server_for_password_resets PRs (diff) | |
download | synapse-b14f8a1baf6f500997ae4c1d6a6d72094ce14270.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d/11429.docker')
0 files changed, 0 insertions, 0 deletions