diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-31 18:11:00 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-31 18:11:00 +0000 |
commit | bbb97a35fdaf7193e22ceacb8c155038b66651d2 (patch) | |
tree | c166033c625605a56b3301dfdc74791f838a2a92 /synapse/crypto/keyring.py | |
parent | lint (diff) | |
parent | Reject large transactions on federation (#4513) (diff) | |
download | synapse-bbb97a35fdaf7193e22ceacb8c155038b66651d2.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrade_federatable
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions