diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2020-10-21 14:13:10 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-10-21 14:13:10 +0100 |
commit | 419595b1d97f8d17d2617484026f439af282a1c2 (patch) | |
tree | f90fb01912b71d72f336ec02663a913a539eee9a /synapse/crypto/keyring.py | |
parent | Merge commit 'd5f7182ba' into anoa/dinsic_release_1_21_x (diff) | |
parent | 1.20.0 (diff) | |
download | synapse-419595b1d97f8d17d2617484026f439af282a1c2.tar.xz |
Merge commit '55bb5fda3' into anoa/dinsic_release_1_21_x
* commit '55bb5fda3': 1.20.0 Add a note about including the changes from 1.19.3. Tweak wording in the changelog.
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions