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/11382.misc | |
| 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/11382.misc')
| -rw-r--r-- | changelog.d/11382.misc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/11382.misc b/changelog.d/11382.misc deleted file mode 100644 index d812ef309e..0000000000 --- a/changelog.d/11382.misc +++ /dev/null @@ -1 +0,0 @@ -Keep fallback key marked as used if it's re-uploaded. |