summary refs log tree commit diff
path: root/synapse/crypto/keyring.py
diff options
context:
space:
mode:
authorKegsay <kegsay@gmail.com>2016-08-23 17:22:38 +0100
committerGitHub <noreply@github.com>2016-08-23 17:22:38 +0100
commit928b2187eab920e768a6076d186aaf97d44510b4 (patch)
tree015f70068aa38404943f6b7ae8b53195901c8f2e /synapse/crypto/keyring.py
parentMerge pull request #1038 from matrix-org/erikj/receved_txn_purge (diff)
parentPass through user-supplied content in /join/$room_id (diff)
downloadsynapse-928b2187eab920e768a6076d186aaf97d44510b4.tar.xz
Merge pull request #1039 from matrix-org/kegan/join-with-custom-content
Pass through user-supplied content in /join/$room_id
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions